Commit Graph
2013 Commits
Author SHA1 Message Date
wangzhijiang b2bde27983 待办中心-项目法规任务,法规评估任务,待办、已办、已发列表优化。
禅道bug修改62251
2022-11-17 17:08:45 +08:00
liyawei 03094024e7 认证-参数清单-子项目引发的变更 2022-11-16 17:23:27 +08:00
高嵩 0337a85e84 合并分支 'dev_2nd_period_test' 到 'master'
修改问题知识库搜索null的id问题

查看合并请求 laws-nio/laws-weilai!248
2022-11-11 12:31:48 +08:00
高嵩 9c88a2b615 修改问题知识库搜索null的id问题 2022-11-11 12:31:19 +08:00
高嵩 4c7db3b451 合并分支 'dev_2nd_period_test' 到 'master'
修改问题知识库搜索中心保存知识分享

查看合并请求 laws-nio/laws-weilai!246
2022-11-11 10:34:43 +08:00
高嵩 db04a93b40 修改问题知识库搜索中心保存知识分享 2022-11-11 09:17:59 +08:00
高嵩 8d3c533faf 合并分支 'dev_2nd_period_test' 到 'master'
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!243
2022-11-09 20:31:44 +08:00
liyawei 7671e43ac2 待办中心-认证参数-bug修改 2022-11-09 11:03:50 +08:00
高嵩 7c1012155d 合并分支 'dev_2nd_period_test' 到 'master'
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!241
2022-11-08 20:34:27 +08:00
高嵩 f077570f80 待办中心-项目名称展示修改。 2022-11-07 14:48:37 +08:00
zhn d1adc622ea 创建子项目 2022-11-07 12:00:18 +08:00
CD e39cfd8d25 Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test 2022-11-07 11:56:18 +08:00
CD 7afa1f6faf 法规意见收集飞书路由跳转 2022-11-07 11:55:19 +08:00
zhn 59bbada012 首页图标权限 2022-11-07 11:02:09 +08:00
高嵩 dbf9de9251 合并分支 'dev_2nd_period_test' 到 'master'
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!239
2022-11-04 19:18:18 +08:00
CD e4428fff01 判空 2022-11-04 18:56:43 +08:00
wangzhijiang 263faf276b update 2022-11-04 18:34:41 +08:00
wangzhijiang c40bf4960c Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test 2022-11-04 18:31:04 +08:00
wangzhijiang 824ce72e2a 禅道bug修改。 2022-11-04 18:30:11 +08:00
高嵩 06ef963a48 合并分支 'feature_dev_20221008_TODO' 到 'master'
Feature dev 20221008 todo

查看合并请求 laws-nio/laws-weilai!238
2022-11-04 18:05:02 +08:00
高嵩 b25cff8964 合并分支 'dev_2nd_period_test' 到 'master'
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!237
2022-11-04 18:04:37 +08:00
liyawei b785097622 待办中心-认证参数-bug修改 2022-11-04 17:25:58 +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
高嵩 07b3db70e2 合并分支 'dev_2nd_period_test' 到 'master'
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!236
2022-11-04 13:45:47 +08:00
liyawei a240e44b8b 认证-参数项收集-填写人导入校验提示语修改 2022-11-04 12:42:01 +08:00
liyawei 49872c55ea 认证-参数项收集-填写人导入bug62128,62110 2022-11-04 12:05:32 +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
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 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
zhn 906ee96ad0 虚拟清单添加跳转 2022-11-03 15:27:28 +08:00
zhn b5cbb52717 问题知识库评论消息添加跳转 2022-11-03 14:49:07 +08:00
高嵩 18eb5b1710 Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into feature_dev_20221008_TODO 2022-11-03 14:45:22 +08:00
高嵩 dc91107df3 62175问题处理-已发流程中不展示自己的数据 2022-11-03 14:45:05 +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 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
高嵩 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