Commit Graph
2848 Commits
Author SHA1 Message Date
wangzhijiang eee6db760d 法规清单-选择角色中英文切换。 2022-07-01 19:16:49 +08:00
qq787203167 36733e11ed 修改禅道已知bug 2022-07-01 18:53:06 +08:00
wangzhijiang 37606d0306 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-01 18:51:20 +08:00
wangzhijiang b82a067d10 设计、prehomo、验证符合性流程,dre提交,给责任人发消息。 2022-07-01 18:50:57 +08:00
zhn 87c8e98e4e 法规清单导出--excel英文名称 2022-07-01 18:48:10 +08:00
qq787203167 070b65e071 修改禅道已知bug 2022-07-01 18:40:02 +08:00
wangzhijiang 43e98bbbf0 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-01 18:29:05 +08:00
wangzhijiang 2e2f07f1d7 设计、prehomo、验证符合性流程,责任人回复dre发送消息。 2022-07-01 18:28:43 +08:00
zhn 148b90030f 相关人员名单导入 2022-07-01 18:24:36 +08:00
qq787203167 1fe481ca17 修改禅道已知bug 2022-07-01 18:14:41 +08:00
qq787203167 1912f76fc2 修改禅道已知bug 2022-07-01 18:10:37 +08:00
zer0Black 1cae6e9239 标签提交的问题 2022-07-01 17:50:18 +08:00
wangzhijiang d156de1ce8 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-01 17:29:15 +08:00
wangzhijiang d65bac3c2b 法规清单列表查询 清单确认状态修改(增加了四种)。
法规清单确认,法规、认证工程师 通过、拒绝时  发送消息 - 55228bug处理。
2022-07-01 17:28:47 +08:00
qq787203167 5d04b64baa 修改禅道已知bug 2022-07-01 16:41:53 +08:00
qq787203167 b0178526e2 修改禅道已知bug 2022-07-01 16:41:40 +08:00
李雪涛 ce554d686e 合并分支 'master' 到 'fix_bug_first_stage'
Master

查看合并请求 laws-nio/laws-weilai!32
2022-07-01 15:22:28 +08:00
李雪涛 7afd56d019 合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage

查看合并请求 laws-nio/laws-weilai!30
2022-07-01 15:21:34 +08:00
zer0Black e3c2475947 处理代码合并漏了的问题 2022-07-01 15:21:19 +08:00
zer0Black 3f43ede228 [fix]导出的文件名切换为中英文可切换的模式 2022-07-01 15:19:51 +08:00
李雪涛 44161c5bd9 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!29
2022-07-01 15:15:37 +08:00
李雪涛 7431729b4b 合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage

查看合并请求 laws-nio/laws-weilai!28
2022-07-01 15:15:24 +08:00
李雪涛 c2972f49d5 合并分支 'master' 到 'dev_third_stage'
Master

查看合并请求 laws-nio/laws-weilai!27
2022-07-01 15:13:59 +08:00
李雪涛 61d64f1e29 合并分支 'master' 到 'fix_bug_first_stage'
Master

查看合并请求 laws-nio/laws-weilai!26
2022-07-01 15:13:46 +08:00
zer0Black a696406651 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/components/uploadFileChangeDown/file.vue
2022-07-01 15:12:31 +08:00
wangzhijiang 77accc3efd Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-01 15:09:10 +08:00
liyawei de5193c5f9 认证-参数项收集-参数项收集切换角色日志 2022-07-01 15:08:52 +08:00
wangzhijiang 00069bf0da 工作流数据库sql更新。 2022-07-01 15:08:29 +08:00
zer0Black 419aeafdba Merge remote-tracking branch 'origin/dev_third_stage' 2022-07-01 15:01:16 +08:00
zer0Black 03031f6563 Merge branch 'dev_third_stage' 2022-07-01 15:00:48 +08:00
李雪涛 f6146a89a1 合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage

查看合并请求 laws-nio/laws-weilai!22
2022-07-01 15:00:00 +08:00
qq787203167 0faf669c5f 修改禅道已知bug 2022-07-01 14:56:04 +08:00
wangzhijiang 82e254e0d3 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-01 14:52:23 +08:00
wangzhijiang 43797582ac 设计、prehomo、验证符合性流程,分配工程师校验(不能分配给自己)。 2022-07-01 14:51:54 +08:00
zer0Black 1e5eb47d97 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-01 14:51:15 +08:00
zer0Black b3be2ec395 转发加上地址 2022-07-01 14:51:05 +08:00
zhn 69a239a897 项目状态看板--时间轴节点名称优化 2022-07-01 14:29:42 +08:00
qq787203167 47f23eabe4 修改禅道已知bug 2022-07-01 14:23:08 +08:00
zhn 5f082ef210 月报标题模板 2022-07-01 14:09:50 +08:00
wangzhijiang 946a8f44b3 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-01 14:02:58 +08:00
wangzhijiang 37d1d71f22 法规清单列表查询优化-列表查询转换字典值方式修改 2022-07-01 14:02:32 +08:00
qq787203167 a29194c894 修改禅道已知bug 2022-07-01 13:51:53 +08:00
zer0Black 50342fcbe4 飞书发送卡片消息对接完成 2022-07-01 13:38:20 +08:00
qq787203167 0a6c8f35dd 修改禅道已知bug 2022-07-01 13:28:51 +08:00
zer0Black 73d3fdba36 所有消息,接入飞书 2022-07-01 12:05:46 +08:00
qq787203167 2cdb33e5d4 修改禅道已知bug 2022-07-01 11:56:32 +08:00
qq787203167 6c1d46996d 修改禅道已知bug 2022-07-01 11:45:01 +08:00
qq787203167 ecc44b5dc6 修改禅道已知bug 2022-07-01 11:37:22 +08:00
qq787203167 96da56370a 修改禅道已知bug 2022-07-01 11:24:27 +08:00
liyawei 44a2815ec9 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-01 10:54:02 +08:00