Commit Graph
5138 Commits
Author SHA1 Message Date
wangzhijiang 824ce72e2a 禅道bug修改。 2022-11-04 18:30:11 +08:00
sunFlower 37be68ce2c 修改禅道已知bug 2022-11-04 17:04:20 +08:00
zhn 72c19d0d85 首页图标 2022-11-04 15:58:33 +08:00
liyawei e28f4fe6a3 Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test 2022-11-04 15:14:54 +08:00
liyawei 992fde2baf 待办中心-认证参数-bug修改 2022-11-04 15:11:52 +08:00
CD 5c5c887d7d Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test 2022-11-04 14:34:35 +08:00
CD ffda1d0f8d 法规技术评估跳转路由 2022-11-04 14:33:12 +08:00
zhn 85f677ac0f 问题知识库发布消息和飞书-跳转详情页 2022-11-04 13:58:06 +08:00
sunFlower d337500e79 修改禅道已知bug 2022-11-04 13:45:27 +08:00
zyx.net 314e9a9657 Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test 2022-11-04 13:41:17 +08:00
zyx.net 3cacb86a8b 项目详情-认证参数列表中清单编辑去掉可以修改模板 2022-11-04 13:39:31 +08:00
liyawei a240e44b8b 认证-参数项收集-填写人导入校验提示语修改 2022-11-04 12:42:01 +08:00
liyawei 49872c55ea 认证-参数项收集-填写人导入bug62128,62110 2022-11-04 12:05:32 +08:00
sunFlower c52d46e4e8 修改禅道已知bug 2022-11-04 11:54:58 +08:00
sunFlower bc979d9c8e 修改禅道已知bug 2022-11-04 11:41:01 +08:00
zhn ffb094de83 首页添加图标及图标的权限 2022-11-04 11:23:44 +08:00
liyawei 92677adbf3 认证-参数模板-导入控件备选值校验bug61759 2022-11-04 11:01:11 +08:00
高嵩 9e5753032b 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!235
2022-11-04 10:19:03 +08:00
sunFlower d53a5289d2 修改禅道已知bug 2022-11-04 09:23:18 +08:00
CD f4ff9764b5 Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test 2022-11-04 09:11:44 +08:00
CD 66ed688f79 bug62162 2022-11-04 09:11:20 +08:00
liyawei 9469cd06e1 待办中心-认证参数-待办标记bug修改 2022-11-04 09:05:36 +08:00
liyawei 3f19a27246 认证-参数项收集-填写人导入-bug修改 2022-11-03 22:03:07 +08:00
zhn 20f5e1e683 虚拟清单撤回不需要发消息 2022-11-03 17:11:16 +08:00
liyawei 895b13b57d 认证-参数项收集-填写人导入-bug62119 2022-11-03 17:10:08 +08:00
zhn 413b0b32e2 项目库--管理员删除 2022-11-03 16:06:07 +08:00
高嵩 09ba8e6f77 合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test'
Feature dev 20221025 message

查看合并请求 laws-nio/laws-weilai!234
2022-11-03 15:35:18 +08:00
高嵩 aed6f23880 合并代码 2022-11-03 15:32:47 +08:00
zhn 906ee96ad0 虚拟清单添加跳转 2022-11-03 15:27:28 +08:00
zhn b5cbb52717 问题知识库评论消息添加跳转 2022-11-03 14:49:07 +08:00
787203167 9fd21f787b 合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test'
Feature dev 20221025 message

查看合并请求 laws-nio/laws-weilai!233
2022-11-03 14:41:59 +08:00
787203167 3dcd84a494 合并分支 'feature_dev_20221008_TODO' 到 'dev_2nd_period_test'
Feature dev 20221008 todo

查看合并请求 laws-nio/laws-weilai!232
2022-11-03 14:41:34 +08:00
787203167 0058770d36 Merge branch 'dev_2nd_period_test' into 'feature_dev_20221008_TODO'
# Conflicts:
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
2022-11-03 14:41:16 +08:00
787203167 cfbee557cf 合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage

查看合并请求 laws-nio/laws-weilai!231
2022-11-03 14:39:52 +08:00
787203167 a26bae373e Merge branch 'dev_2nd_period_test' into 'dev_third_stage'
# Conflicts:
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js
#   jero-web/src/views/projectManagement/components/TaskList.vue
#   jero-web/src/views/projectManagement/components/cuibanModel.vue
2022-11-03 14:39:38 +08:00
高嵩 0d3afb0fef 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!230
2022-11-03 14:32:27 +08:00
高嵩 3f7ad00c1d Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend'
# Conflicts:
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js
2022-11-03 14:32:08 +08:00
CD 7f3c977464 bug 2022-11-03 14:15:08 +08:00
liyawei f0f977ebaa 认证-参数项收集-填写人导入-bug62116 2022-11-03 11:28:30 +08:00
zyx.net 079a49ee5d 参数项收集清单导入导出修改 2022-11-03 10:41:44 +08:00
liyawei da1effd003 认账-参数项收集-填写人导入-bug修改 2022-11-03 10:14:18 +08:00
zyx.net 5abbf14407 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-11-03 09:53:28 +08:00
zyx.net bed54d7869 参数项列表新增 控件备选值不能输入!和# 2022-11-03 09:52:37 +08:00
liyawei c9fef8fc22 认账-参数项收集-填写人导出-bug62129 2022-11-02 22:11:37 +08:00
liyawei aeb09cede5 添加sql 2022-11-02 19:56:34 +08:00
liyawei 67b18a48a4 待办中心-认证参数-查询优化,添加待办标记 2022-11-02 19:53:12 +08:00
zyx.net abe7dcafaa 参数收集待办任务跳转修改 2022-11-02 18:16:04 +08:00
CD 6aaf4a2d94 内容 2022-11-02 18:00:57 +08:00
CD cc54e5dcaa bug 2022-11-02 17:56:11 +08:00
CD 340bc851ea 英文 2022-11-02 17:12:01 +08:00