Commit Graph

Select branches

Hide Pull Requests

dev

docker_package

master

release

show

wangliwen

docker打包分支不要轻易合并本分支

v0.8.0

v0.8.0.1

v0.8.1.1.release(本地测试环境测试)

v0.8.1.2.release（西海岸部署修复）

v0.8.1.3.release（市局部署修复）

v0.8.1.4.release(市局问题修复)

v0.8.1.5.release(市局问题修复)

v0.8.1.dev

千万不要合并这个分支

缺陷修复版本

能力申请V3

Mono Color

• 1ee75d834d 调整dockerfile 启动指令 wangliwen 2022-10-25 09:33:20 +0800
• cdb7cb3012 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev huangweixiong 2022-10-25 09:14:05 +0800
• 4ab4265e19 enke:查询用户列表 lizhicheng 2022-10-24 18:30:44 +0800
• 3b5975d921 Merge branch 'master' into docker_package wangliwen 2022-10-24 17:27:28 +0800
• d372c76c4e Merge branch 'dev' wangliwen 2022-10-24 17:27:21 +0800
• 2104fa597b 打包处理 wangliwen 2022-10-24 17:27:12 +0800
• b750582a43 Merge branch 'master' into docker_package wangliwen 2022-10-24 15:13:36 +0800
• edc669f15a Merge branch 'dev' wangliwen 2022-10-24 15:13:09 +0800
• 6ba7839344 pom文件调整 wangliwen 2022-10-24 15:12:59 +0800
• 7040ce1b81 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev huangweixiong 2022-10-24 15:00:54 +0800
• 21c2228e87 Merge branch 'master' into docker_package wangliwen 2022-10-24 14:59:48 +0800
• fcb9390bc7 Merge branch 'dev' wangliwen 2022-10-24 14:59:42 +0800
• bebac3abcf ... wangliwen 2022-10-24 14:59:34 +0800
• 8ae5cad4d3 Merge branch 'master' into docker_package wangliwen 2022-10-24 14:27:17 +0800
• 5e4fa8fe1b Merge branch 'dev' wangliwen 2022-10-24 14:27:09 +0800
• e8b3394d7e Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev huangweixiong 2022-10-24 14:26:54 +0800
• f358cdf596 更新知识库配置文件 huangweixiong 2022-10-24 14:09:39 +0800
• 08a2af2b8b enke视频会议 lizhicheng 2022-10-24 13:59:40 +0800
• 0cedf0c2a9 Merge branch 'master' into docker_package wangliwen 2022-10-22 10:51:41 +0800
• 6402a9667d Merge remote-tracking branch 'origin/dev' wangliwen 2022-10-22 10:51:31 +0800
• 6feb229b22 生产环境配置文件 huangweixiong 2022-10-22 10:48:16 +0800
• f0084dc031 【修复】消息中心-拼接的审批人为申请人问题 huangweixiong 2022-10-22 10:47:58 +0800
• a1bd241901 Merge branch 'master' into docker_package DESKTOP-VA9NQUP\liwen 2022-10-21 19:19:08 +0800
• b14d805a4c Merge branch 'dev' DESKTOP-VA9NQUP\liwen 2022-10-21 19:19:02 +0800
• f57a7f3b9c 1.门户首页全局搜索加上会议室搜索结果 2.能力使用申请流程到资源所属部门审批节点时去除分配默认的审批人为大数据局审批员时自动通过 dinggang 2022-10-21 17:15:44 +0800
• 2ebb40ff76 Merge branch 'master' into docker_package DESKTOP-VA9NQUP\liwen 2022-10-21 14:25:55 +0800
• 0e2c7b93ae Merge branch 'dev' DESKTOP-VA9NQUP\liwen 2022-10-21 14:25:47 +0800
• a59b6828bf Merge remote-tracking branch 'origin/dev' into dev DESKTOP-VA9NQUP\liwen 2022-10-21 14:25:31 +0800
• c8d453a94d 转办文案调整 DESKTOP-VA9NQUP\liwen 2022-10-21 14:25:22 +0800
• a0c7496d97 亚威消息推送 huangweixiong 2022-10-21 13:43:53 +0800
• c28d868f07 Merge branch 'master' into docker_package DESKTOP-VA9NQUP\liwen 2022-10-21 12:00:40 +0800
• ef6971f2eb Merge branch 'dev' DESKTOP-VA9NQUP\liwen 2022-10-21 12:00:32 +0800
• d8821ec1a6 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev huangweixiong 2022-10-21 11:49:20 +0800
• 328b1872e4 消息推送将进入对应的待办列表 huangweixiong 2022-10-21 11:48:38 +0800
• f897b698c4 Merge branch 'master' into docker_package DESKTOP-VA9NQUP\liwen 2022-10-21 10:15:45 +0800
• b4ea272340 Merge branch 'dev' DESKTOP-VA9NQUP\liwen 2022-10-21 10:15:38 +0800
• 8a70790b27 统计报表筛选完善 lizhicheng 2022-10-21 09:56:56 +0800
• 8fda5f3b52 Merge branch 'master' into docker_package wangliwen 2022-10-20 15:16:21 +0800
• a39f5c84c3 Merge branch 'dev' wangliwen 2022-10-20 15:16:13 +0800
• 1700ea0cae 分配到系统默认审核人时，调整通知文案 wangliwen 2022-10-20 15:16:03 +0800
• 7e0e809615 Merge branch 'master' into docker_package wangliwen 2022-10-20 11:51:45 +0800
• e83f712193 Merge branch 'dev' wangliwen 2022-10-20 11:51:38 +0800
• 583d6aaee0 能力统计各榜单排序逻辑修改 dinggang 2022-10-20 11:50:12 +0800
• 14daa09790 Merge branch 'master' into docker_package wangliwen 2022-10-20 09:33:22 +0800
• e07f88e2ad Merge branch 'dev' wangliwen 2022-10-20 09:33:13 +0800
• 8c256f315d 代码格式化 wangliwen 2022-10-20 09:33:01 +0800
• 734c247adc Merge branch 'master' into docker_package wangliwen 2022-10-19 14:04:09 +0800
• 9c1b01c6d1 Merge branch 'dev' wangliwen 2022-10-19 14:04:01 +0800
• 027e493020 ... wangliwen 2022-10-19 14:03:52 +0800
• 94765a612d Merge branch 'master' into docker_package wangliwen 2022-10-19 11:13:52 +0800
• 0b9ee53bc8 Merge branch 'dev' wangliwen 2022-10-19 11:13:43 +0800
• 30a4ce6797 统计报表加分页 lizhicheng 2022-10-19 10:16:23 +0800
• f114059256 Merge branch 'master' into docker_package wangliwen 2022-10-19 08:54:31 +0800
• 5d0b4bc32d Merge branch 'dev' wangliwen 2022-10-19 08:54:22 +0800
• 1bcb055baf Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev huangweixiong 2022-10-18 17:35:29 +0800
• 109a2a1f79 待办推送格式修改 huangweixiong 2022-10-18 17:34:59 +0800
• 5f6fafb7b2 Merge branch 'master' into docker_package wangliwen 2022-10-18 17:22:52 +0800
• 4245d1c782 Merge branch 'dev' wangliwen 2022-10-18 17:22:45 +0800
• 14a9aa33ae Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev wangliwen 2022-10-18 17:22:34 +0800
• 3dde0b314d Merge branch 'master' into docker_package wangliwen 2022-10-18 17:21:48 +0800
• d7f8bf7656 Merge branch 'dev' wangliwen 2022-10-18 17:21:41 +0800
• 317a0d21aa CIM智能算法改开发组件 lizhicheng 2022-10-18 17:07:46 +0800
• b326c8e24b Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev huangweixiong 2022-10-18 16:41:18 +0800
• 482e3fd51c 修改能力申请的发送通知 huangweixiong 2022-10-18 16:40:39 +0800
• dd63b8db3d Merge branch 'master' into docker_package wangliwen 2022-10-18 15:43:37 +0800
• 488ed3ec33 Merge branch 'dev' wangliwen 2022-10-18 15:43:30 +0800
• f2a1b152a8 数据异常导出失败 wangliwen 2022-10-18 15:43:22 +0800
• e9e685beb8 Merge branch 'master' into docker_package wangliwen 2022-10-18 15:22:06 +0800
• 03a0b43941 Merge branch 'dev' wangliwen 2022-10-18 15:21:59 +0800
• a4047352c1 npe wangliwen 2022-10-18 15:21:50 +0800
• 90b9c0b112 Merge branch 'master' into docker_package wangliwen 2022-10-18 14:38:56 +0800
• 1d16cca31b Merge branch 'dev' wangliwen 2022-10-18 14:38:49 +0800
• f1d3fea424 导出表头宽度自适应 wangliwen 2022-10-18 14:38:41 +0800
• 24749b0c18 Merge branch 'master' into docker_package wangliwen 2022-10-18 13:44:11 +0800
• 847f1490b8 Merge branch 'dev' wangliwen 2022-10-18 13:44:04 +0800
• 094d27fddf 调整导出文件名 wangliwen 2022-10-18 13:43:54 +0800
• 9426631fee Merge branch 'master' into docker_package wangliwen 2022-10-18 11:31:45 +0800
• 7499cbf4a0 Merge branch 'dev' wangliwen 2022-10-18 11:31:38 +0800
• fa94eb77f3 ... wangliwen 2022-10-18 11:31:31 +0800
• f5ff6df7ca Merge branch 'master' into docker_package wangliwen 2022-10-18 11:18:43 +0800
• c9c256ff87 Merge branch 'dev' wangliwen 2022-10-18 11:18:36 +0800
• 17cd5900f8 Merge remote-tracking branch '备份/dev' into dev wangliwen 2022-10-18 11:18:24 +0800
• 020a32519a 能力统计 导出 wangliwen 2022-10-18 11:18:11 +0800
• 7c4b941031 CIM组件统计改为开发组件 lizhicheng 2022-10-18 10:00:46 +0800
• d6907665be Merge branch 'master' into docker_package wangliwen 2022-10-18 09:58:25 +0800
• 41d382c71a Merge branch 'dev' wangliwen 2022-10-18 09:58:18 +0800
• c02702e70e selectDeptDetailTypeCountList 增加导出接口 wangliwen 2022-10-18 09:58:06 +0800
• 23a3c38620 Merge branch 'master' into docker_package wangliwen 2022-10-18 09:05:27 +0800
• 6004a99da7 Merge branch 'dev' wangliwen 2022-10-18 09:05:05 +0800
• 9961970fb1 npe lizhicheng 2022-10-17 17:56:53 +0800
• 1b7c0c2c03 Merge branch 'master' into docker_package wangliwen 2022-10-17 16:54:56 +0800
• 3e54f99052 Merge branch 'dev' wangliwen 2022-10-17 16:54:43 +0800
• 5b85df5010 会议室重复统计 wangliwen 2022-10-17 16:54:25 +0800
• daf2836de8 Merge branch 'master' into docker_package wangliwen 2022-10-17 16:29:09 +0800
• 02893504fc Merge branch 'dev' wangliwen 2022-10-17 16:29:03 +0800
• a2231e4d11 ... wangliwen 2022-10-17 16:28:54 +0800
• 7bc45d64a9 Merge branch 'master' into docker_package wangliwen 2022-10-17 16:18:28 +0800
• 6701c763a8 Merge branch 'dev' wangliwen 2022-10-17 16:18:20 +0800
• 834fbb9d8c npe wangliwen 2022-10-17 16:18:10 +0800
• abcf6a16ea Merge branch 'master' into docker_package wangliwen 2022-10-17 16:07:36 +0800