Commit Graph

2814 Commits

Author SHA1 Message Date
wangliwen 3b5975d921 Merge branch 'master' into docker_package 2022-10-24 17:27:28 +08:00
wangliwen d372c76c4e Merge branch 'dev' 2022-10-24 17:27:21 +08:00
wangliwen 2104fa597b 打包处理 2022-10-24 17:27:12 +08:00
wangliwen b750582a43 Merge branch 'master' into docker_package 2022-10-24 15:13:36 +08:00
wangliwen edc669f15a Merge branch 'dev' 2022-10-24 15:13:09 +08:00
wangliwen 6ba7839344 pom文件调整 2022-10-24 15:12:59 +08:00
huangweixiong 7040ce1b81 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  ...
2022-10-24 15:00:54 +08:00
wangliwen 21c2228e87 Merge branch 'master' into docker_package 2022-10-24 14:59:48 +08:00
wangliwen fcb9390bc7 Merge branch 'dev' 2022-10-24 14:59:42 +08:00
wangliwen bebac3abcf ... 2022-10-24 14:59:34 +08:00
wangliwen 8ae5cad4d3 Merge branch 'master' into docker_package 2022-10-24 14:27:17 +08:00
wangliwen 5e4fa8fe1b Merge branch 'dev' 2022-10-24 14:27:09 +08:00
huangweixiong e8b3394d7e Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  enke视频会议
2022-10-24 14:26:54 +08:00
huangweixiong f358cdf596 更新知识库配置文件 2022-10-24 14:09:39 +08:00
lizhicheng 08a2af2b8b enke视频会议 2022-10-24 13:59:40 +08:00
wangliwen 0cedf0c2a9 Merge branch 'master' into docker_package 2022-10-22 10:51:41 +08:00
wangliwen 6402a9667d Merge remote-tracking branch 'origin/dev' 2022-10-22 10:51:31 +08:00
huangweixiong 6feb229b22 生产环境配置文件 2022-10-22 10:48:16 +08:00
huangweixiong f0084dc031 【修复】消息中心-拼接的审批人为申请人问题 2022-10-22 10:47:58 +08:00
DESKTOP-VA9NQUP\liwen a1bd241901 Merge branch 'master' into docker_package 2022-10-21 19:19:08 +08:00
DESKTOP-VA9NQUP\liwen b14d805a4c Merge branch 'dev' 2022-10-21 19:19:02 +08:00
dinggang f57a7f3b9c 1.门户首页全局搜索加上会议室搜索结果
2.能力使用申请流程到资源所属部门审批节点时去除分配默认的审批人为大数据局审批员时自动通过
2022-10-21 17:15:44 +08:00
DESKTOP-VA9NQUP\liwen 2ebb40ff76 Merge branch 'master' into docker_package 2022-10-21 14:25:55 +08:00
DESKTOP-VA9NQUP\liwen 0e2c7b93ae Merge branch 'dev' 2022-10-21 14:25:47 +08:00
DESKTOP-VA9NQUP\liwen a59b6828bf Merge remote-tracking branch 'origin/dev' into dev 2022-10-21 14:25:31 +08:00
DESKTOP-VA9NQUP\liwen c8d453a94d 转办文案调整 2022-10-21 14:25:22 +08:00
huangweixiong a0c7496d97 亚威消息推送 2022-10-21 13:43:53 +08:00
DESKTOP-VA9NQUP\liwen c28d868f07 Merge branch 'master' into docker_package 2022-10-21 12:00:40 +08:00
DESKTOP-VA9NQUP\liwen ef6971f2eb Merge branch 'dev' 2022-10-21 12:00:32 +08:00
huangweixiong d8821ec1a6 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  统计报表筛选完善
  分配到系统默认审核人时,调整通知文案
  能力统计各榜单排序逻辑修改
2022-10-21 11:49:20 +08:00
huangweixiong 328b1872e4 消息推送将进入对应的待办列表 2022-10-21 11:48:38 +08:00
DESKTOP-VA9NQUP\liwen f897b698c4 Merge branch 'master' into docker_package 2022-10-21 10:15:45 +08:00
DESKTOP-VA9NQUP\liwen b4ea272340 Merge branch 'dev' 2022-10-21 10:15:38 +08:00
lizhicheng 8a70790b27 统计报表筛选完善 2022-10-21 09:56:56 +08:00
wangliwen 8fda5f3b52 Merge branch 'master' into docker_package 2022-10-20 15:16:21 +08:00
wangliwen a39f5c84c3 Merge branch 'dev' 2022-10-20 15:16:13 +08:00
wangliwen 1700ea0cae 分配到系统默认审核人时,调整通知文案 2022-10-20 15:16:03 +08:00
wangliwen 7e0e809615 Merge branch 'master' into docker_package 2022-10-20 11:51:45 +08:00
wangliwen e83f712193 Merge branch 'dev' 2022-10-20 11:51:38 +08:00
dinggang 583d6aaee0 能力统计各榜单排序逻辑修改 2022-10-20 11:50:12 +08:00
wangliwen 14daa09790 Merge branch 'master' into docker_package 2022-10-20 09:33:22 +08:00
wangliwen e07f88e2ad Merge branch 'dev' 2022-10-20 09:33:13 +08:00
wangliwen 8c256f315d 代码格式化 2022-10-20 09:33:01 +08:00
wangliwen 734c247adc Merge branch 'master' into docker_package 2022-10-19 14:04:09 +08:00
wangliwen 9c1b01c6d1 Merge branch 'dev' 2022-10-19 14:04:01 +08:00
wangliwen 027e493020 ... 2022-10-19 14:03:52 +08:00
wangliwen 94765a612d Merge branch 'master' into docker_package 2022-10-19 11:13:52 +08:00
wangliwen 0b9ee53bc8 Merge branch 'dev' 2022-10-19 11:13:43 +08:00
lizhicheng 30a4ce6797 统计报表加分页 2022-10-19 10:16:23 +08:00
wangliwen f114059256 Merge branch 'master' into docker_package 2022-10-19 08:54:31 +08:00