Commit Graph
2857 Commits
Author SHA1 Message Date
zhn bf68ee69c0 法规月报填写 2022-07-02 11:41:32 +08:00
qq787203167 d155adacc0 修改禅道已知bug 2022-07-02 11:35:19 +08:00
zyx.net 65c25fe8cd Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-02 11:12:54 +08:00
zyx.net 4ae082a15f 修改禅道bug 2022-07-02 11:12:23 +08:00
liyawei ee95f79566 认证-参数清单-权限 2022-07-02 11:02:02 +08:00
qq787203167 16979ff779 修改禅道已知bug 2022-07-02 10:57:02 +08:00
zyx.net b37d28de24 修改认证参数列表权限 2022-07-02 10:42:38 +08:00
zyx.net 01d3743196 认证参数列表添加按钮权限 2022-07-02 10:25:32 +08:00
zyx.net 5ca36b23c7 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-02 10:06:46 +08:00
zyx.net f78eab8764 认证参数列表添加配置调取接口控制权限 2022-07-02 10:04:31 +08:00
qq787203167 a889cb39a8 修改禅道已知bug 2022-07-02 09:59:55 +08:00
liyawei 3ba874dfe8 认证-参数清单-配置标识接口 2022-07-02 09:52:01 +08:00
qq787203167 13a53a2bdd 修改禅道已知bug 2022-07-02 09:47:35 +08:00
zer0Black aaefa47298 记录部署信息 2022-07-02 09:37:11 +08:00
zyx.net 21f2f8177c Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-01 19:05:53 +08:00
zyx.net 52caeb30d0 修改禅道bug 2022-07-01 19:04:19 +08:00
qq787203167 f5fd668769 修改禅道已知bug 2022-07-01 18:54:35 +08:00
zyx.net e4aca9dd2c Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-01 17:17:08 +08:00
zyx.net 9619b5f715 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-01 17:16:46 +08:00
liyawei b39a4b02dc Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-01 17:15:09 +08:00
liyawei e3a7672a03 认证-参数项收集-飞书发送卡片消息 2022-07-01 17:14:40 +08:00
zyx.net 2a14a594b9 参数项收集清单列表增加分页 2022-07-01 17:13:55 +08:00
zhn 98fa36c7b9 月报标题模板--上移下移 2022-07-01 16:32:45 +08:00
liyawei 1f5d9aa3ec Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-01 16:19:20 +08:00
liyawei e1b926e21c 认证-参数项收集-分页 2022-07-01 16:19:12 +08:00
李雪涛 f8d786487e 合并分支 'master' 到 'dev_third_stage'
Master

查看合并请求 laws-nio/laws-weilai!31
2022-07-01 15:22:15 +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