Commit Graph

2574 Commits

Author SHA1 Message Date
wangliwen 1a4505cefc Merge branch 'dev' 2022-12-16 15:07:49 +08:00
wangliwen 9769701093 ... 2022-12-16 15:07:42 +08:00
wangliwen 35aded9760 Merge branch 'dev' 2022-12-16 14:56:08 +08:00
wangliwen 2e5677486a ... 2022-12-16 14:56:00 +08:00
wangliwen 7795d59223 Merge branch 'dev' 2022-12-16 14:54:25 +08:00
wangliwen 9e37adfceb 过滤后端 HIQDUCS-666 2022-12-16 14:54:13 +08:00
wangliwen ea7027af3b Merge branch 'dev' 2022-12-16 11:46:38 +08:00
wangliwen 94260ff02d 2022-12-16 11:46:31 +08:00
wangliwen f9d893c8e7 ... 2022-12-16 11:45:59 +08:00
wangliwen da4c1b88ed Merge branch 'dev' 2022-12-16 10:49:33 +08:00
wangliwen 0f4d2c0bd0 /resource/page 接口支持传部门id过滤 2022-12-16 10:49:26 +08:00
wangliwen 3f5c12bc2c Merge branch 'dev' 2022-12-16 10:02:29 +08:00
wangliwen 0aede1e910 能力申请市局使用缓存线程池 2022-12-16 10:02:21 +08:00
wangliwen de0884b76f Merge branch 'dev' 2022-12-16 09:42:10 +08:00
wangliwen 859edc9864 ... 2022-12-16 09:41:55 +08:00
wangliwen 321bf20f4b Merge branch 'dev' 2022-12-15 17:03:44 +08:00
dinggang 81fe70aa42 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-12-15 16:45:47 +08:00
dinggang d403b27c5f .. 2022-12-15 16:43:19 +08:00
wangliwen 91651c7e1d Merge branch 'dev' 2022-12-15 14:45:03 +08:00
wangliwen 232c160abe npe 2022-12-15 14:44:55 +08:00
wangliwen a9e8c8319c Merge branch 'dev' 2022-12-15 14:27:40 +08:00
wangliwen db11899094 2022-12-15 14:27:33 +08:00
wangliwen c2596cf732 Merge branch 'dev' 2022-12-15 13:52:44 +08:00
wangliwen 274cbd9de8 ... 2022-12-15 13:52:34 +08:00
wangliwen 81847e3d6e Merge branch 'dev' 2022-12-15 12:33:36 +08:00
wangliwen 022b0d15e3 ... 2022-12-15 12:33:28 +08:00
wangliwen 6632b7fecb Merge branch 'dev' 2022-12-15 09:58:03 +08:00
wangliwen 889f59c7ae ... 2022-12-15 09:57:49 +08:00
wangliwen e10a025b48 Merge branch 'dev' 2022-12-14 16:11:02 +08:00
wangliwen 0b654e53f1 ... 2022-12-14 16:06:06 +08:00
wangliwen c5818df312 Merge branch 'dev' 2022-12-14 15:44:58 +08:00
wangliwen a495fff99d resourceSelectTotal 缓存失败的处理 2022-12-14 15:44:27 +08:00
wangliwen f7401dbaca Merge branch 'dev' 2022-12-14 15:26:17 +08:00
wangliwen 6fb4457625 ...屮 2022-12-14 15:26:07 +08:00
wangliwen b3af80bb0a Merge branch 'dev' 2022-12-14 15:17:14 +08:00
wangliwen 99df97a174 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-12-14 15:16:28 +08:00
dinggang 38bd349887 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-12-14 15:15:17 +08:00
dinggang 2a00f826a8 npe 2022-12-14 15:14:51 +08:00
wangliwen fd680542a5 ... 2022-12-14 15:14:34 +08:00
wangliwen 8459f2acc9 Merge branch 'dev' 2022-12-14 14:24:24 +08:00
wangliwen ffae066127 500 2022-12-14 14:24:15 +08:00
wangliwen b8bf1e62f9 Merge branch 'dev' 2022-12-14 13:58:52 +08:00
wangliwen 9b982cadcc selectTotal 缓存 2022-12-14 13:58:44 +08:00
wangliwen edb5c683f8 Merge branch 'dev' 2022-12-14 11:46:16 +08:00
dinggang fbeadb6ba3 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
# Conflicts:
#	renren-admin/src/main/resources/db/V8.4__tb_fuse_add_col.sql
2022-12-14 11:39:51 +08:00
dinggang 6e1bea68ff 1.赋能场景需求变更
2.能力统计逻辑修改
3.sql
2022-12-14 11:38:36 +08:00
wangliwen 928237e8e4 Merge branch 'dev' 2022-12-14 11:32:45 +08:00
wangliwen 5dc4b1e482 分页数量不正确 2022-12-14 11:32:34 +08:00
wangliwen 88ec021412 Merge branch 'dev' 2022-12-14 10:48:16 +08:00
wangliwen f7e739ea7d 获取具备审核权限人员时支持过滤已加入审核组人员 2022-12-14 10:48:01 +08:00