Commit Graph

858 Commits

Author SHA1 Message Date
wangliwen fe69f08765 Merge branch 'dev' into docker_package 2022-07-08 11:00:42 +08:00
wangliwen a34e254e79 二级缓存策略调整 2022-07-08 11:00:17 +08:00
wangliwen 9fbe1a69e9 Merge branch 'master' into docker_package 2022-07-08 10:31:39 +08:00
wangliwen 44dd889936 timeout too small. 2022-07-08 10:31:08 +08:00
wangliwen 5a88770943 Merge branch 'master' into docker_package 2022-07-08 10:13:04 +08:00
wangliwen 73dd3535bd Merge branch 'master' into dev 2022-07-08 10:11:43 +08:00
wangliwen 90b62a9f8f 调整知识库http客户端线程池 2022-07-08 10:11:16 +08:00
wangliwen 486c9b8d02 Merge branch 'master' into docker_package 2022-07-08 09:38:33 +08:00
wangliwen e1329442cb 调整pageWithAttrs 接口代码结构 2022-07-08 09:37:28 +08:00
wangliwen 0f980cf238 解决能力集市 筛选各类排序失效(内部二级缓存) 2022-07-08 09:18:03 +08:00
wangliwen 9be7dd5f28 Merge branch 'master' into docker_package 2022-07-07 19:56:28 +08:00
wangliwen ec6597ba35 按总体评分 逆序与顺序 2022-07-07 19:55:54 +08:00
wangliwen 408920d950 Merge branch 'master' into docker_package 2022-07-07 19:50:55 +08:00
wangliwen 861e5413e5 排序失败 2022-07-07 19:49:56 +08:00
wangliwen 27e7aa8654 Merge branch 'master' into docker_package 2022-07-07 19:26:26 +08:00
wangliwen d9511cb1c6 ... 2022-07-07 19:25:19 +08:00
wangliwen 77722d8226 Merge branch 'master' into docker_package 2022-07-07 18:57:53 +08:00
wangliwen 213f25085e 查询所有部门 2022-07-07 18:57:09 +08:00
wangliwen 88707274d3 Merge branch 'master' into docker_package 2022-07-07 18:32:30 +08:00
wangliwen 4cc31af90e ... 2022-07-07 18:32:05 +08:00
wangliwen b349a87010 Merge branch 'master' into docker_package 2022-07-07 18:17:15 +08:00
wangliwen 7dec63c6c8 能力申请方 能力集数目异常 2022-07-07 18:16:14 +08:00
wangliwen 75b10cd9d1 Merge branch 'dev' into docker_package 2022-07-07 17:40:03 +08:00
wangliwen d84737dbd6 线程池调整 2022-07-07 17:38:58 +08:00
wangliwen 3189d96992 Merge branch 'master' into docker_package 2022-07-07 16:51:31 +08:00
wangliwen cd87eb6072 sql调整 2022-07-07 16:50:01 +08:00
wangliwen e6a6d64d38 Merge branch 'dev' into docker_package
# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java
2022-07-07 16:05:13 +08:00
wangliwen 0ee54db89e 评论自动通过时状态异常 2022-07-07 16:04:08 +08:00
yitonglei 6b5c67f60e 1、修改 能力统计列表和详情-所有详情展示的sql语句,统计以当前部门为准,不包含其下级部门 2022-07-07 15:59:58 +08:00
wangliwen 4842aa936f 自动通过的评论状态不对? 2022-07-07 15:39:09 +08:00
wangliwen 0a0f3543c7 Merge branch 'dev' into docker_package 2022-07-07 15:18:38 +08:00
wangliwen 7c5362464e 。。。 2022-07-07 15:18:18 +08:00
wangliwen 80356dff2d Merge branch 'dev' into docker_package 2022-07-07 14:58:54 +08:00
wangliwen cdebffd2b5 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-07-07 14:58:27 +08:00
wangliwen ca667cb116 捕获站内信通知异常 2022-07-07 14:58:09 +08:00
yitonglei 3d49aae51d 1、修改 能力统计列表和详情-组件服务-应用领域分布情况的sql语句 2022-07-07 14:23:10 +08:00
wangliwen fa34ec0c2b Merge branch 'dev' into docker_package 2022-07-07 14:18:04 +08:00
wangliwen 2041c6b558 ...调整 2022-07-07 14:17:49 +08:00
wangliwen c69f7ea262 Merge branch 'dev' into docker_package 2022-07-07 13:57:14 +08:00
wangliwen 9226d20e7a 。。。 2022-07-07 13:57:02 +08:00
wangliwen a29c377456 Merge branch 'master' into docker_package 2022-07-07 12:37:30 +08:00
wangliwen e494a94c57 异步更新访问量 2022-07-07 12:00:42 +08:00
wangliwen 8844a9fdf2 Merge branch 'dev' into docker_package 2022-07-07 11:53:56 +08:00
wangliwen fc715c9cd4 2022-07-07 11:53:46 +08:00
wangliwen 816bf600ad Merge branch 'dev' into docker_package 2022-07-07 11:38:51 +08:00
wangliwen 8371b085f4 。。。 2022-07-07 11:38:35 +08:00
wangliwen d568739dfa Merge branch 'dev' into docker_package 2022-07-07 10:29:51 +08:00
wangliwen ac7f9f5b68 所有流程审核人为发起人时,默认审核通过 2022-07-07 10:29:28 +08:00
wangliwen 2dc4a978ed Merge branch 'dev' into docker_package 2022-07-07 10:07:56 +08:00
wangliwen 08e3b2d09a 字体缺失,镜像内处理 2022-07-07 10:07:49 +08:00