 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 |
|
|
zyx.net
|
079a49ee5d
|
参数项收集清单导入导出修改
|
2022-11-03 10:41:44 +08:00 |
|
|
zyx.net
|
abe7dcafaa
|
参数收集待办任务跳转修改
|
2022-11-02 18:16:04 +08:00 |
|
|
zyx.net
|
53bae2d6d1
|
任务清单增加催办错误提示
|
2022-11-02 11:44:41 +08:00 |
|
|
zyx.net
|
7ae9f2de69
|
任务清单增加催办功能
|
2022-11-02 10:46:32 +08:00 |
|
|
zyx.net
|
c145f18ad1
|
任务清单增加催办功能
|
2022-11-02 10:08:41 +08:00 |
|
|
zyx.net
|
38e8f211d6
|
任务清单增加催办功能
|
2022-11-02 09:16:28 +08:00 |
|
|
高嵩
|
632af0d148
|
合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend
查看合并请求 laws-nio/laws-weilai!227
|
2022-11-02 09:08:16 +08:00 |
|
|
高嵩
|
cf6a9fa0cd
|
合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage
查看合并请求 laws-nio/laws-weilai!226
|
2022-11-02 09:07:54 +08:00 |
|
|
zyx.net
|
e1430d1413
|
填写人导出搜索条件修改
|
2022-11-01 16:35:57 +08:00 |
|
|
sunFlower
|
81c9c76fb0
|
修改禅道已知bug
|
2022-11-01 16:12:53 +08:00 |
|
|
sunFlower
|
923e099599
|
修改禅道已知bug
|
2022-11-01 15:36:11 +08:00 |
|
|
sunFlower
|
58efb3b360
|
修改禅道已知bug
|
2022-11-01 14:14:54 +08:00 |
|
|
高嵩
|
cd6dc3c44a
|
Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend'
# Conflicts:
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
|
2022-10-28 16:34:39 +08:00 |
|
|
zyx.net
|
e3e14194e9
|
参数项收集清单填写人导出功能
|
2022-10-28 09:41:59 +08:00 |
|
|
高嵩
|
c3adfe0e49
|
Merge remote-tracking branch 'origin/feature_dev_20221010_extend' into dev_2nd_period_test
|
2022-10-27 15:23:17 +08:00 |
|
|
zyx.net
|
e7258052d1
|
收集清单柱状图，收集清单下拉框宽度修改
|
2022-10-27 11:55:48 +08:00 |
|
|
zyx.net
|
55f74e8b64
|
1.收集清单柱状图，收集清单下拉框宽度修改
2.参数项收集清单填写人增加导入导出功能
|
2022-10-27 11:11:16 +08:00 |
|
|
高嵩
|
3ba0ae2367
|
Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into dev_2nd_period_test
# Conflicts:
# jero-boot/db/蔚来标准sql/dev_third_record.sql
# jero-web/src/common/lang/en-us.js
# jero-web/src/common/lang/zh-cn.js
# jero-web/src/store/modules/user.js
# jero-web/src/views/processCenter/components/feedbackInformation.vue
# jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
|
2022-10-27 09:49:39 +08:00 |
|
|
sunFlower
|
440cf115b3
|
修改消息通知
|
2022-10-25 09:44:34 +08:00 |
|
|
高嵩
|
798a3b5161
|
Merge branch 'dev_2nd_period' into 'feature_dev_20221010_extend'
# Conflicts:
# jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
|
2022-10-24 10:09:49 +08:00 |
|
|
sunFlower
|
7ebbe9c130
|
对接项目库嘚变更
|
2022-10-21 17:41:50 +08:00 |
|
|
sunFlower
|
6ded489ed5
|
对接项目库嘚变更
|
2022-10-21 17:32:14 +08:00 |
|
|
sunFlower
|
c184964399
|
对接项目库嘚变更
|
2022-10-21 17:30:11 +08:00 |
|
|
zyx.net
|
b25469a429
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-10-20 11:45:11 +08:00 |
|
|
zyx.net
|
42ac31df37
|
参数项清单表头添加传参
|
2022-10-20 11:44:03 +08:00 |
|
|
sunFlower
|
a7f6a476e3
|
修改认证参数列表
|
2022-10-20 11:00:01 +08:00 |
|
|
sunFlower
|
ab92a4dcca
|
对接待办中心
|
2022-10-19 09:40:53 +08:00 |
|
|
sunFlower
|
f011361fd7
|
对接项目库
|
2022-10-18 12:00:07 +08:00 |
|
|
sunFlower
|
387df93346
|
对接项目库
|
2022-10-18 11:49:35 +08:00 |
|
|
sunFlower
|
2dd540a03a
|
对接项目库
|
2022-10-18 10:01:17 +08:00 |
|
|
sunFlower
|
308cdf5ffb
|
对接项目变更
|
2022-10-17 16:30:59 +08:00 |
|
|
zyx.net
|
248078f69b
|
待办中心 项目参数任务对接后端
|
2022-10-17 15:02:29 +08:00 |
|
|
sunFlower
|
2cbfb02ea6
|
布局项目库变更
|
2022-10-17 10:59:54 +08:00 |
|
|
sunFlower
|
cc976709a5
|
布局项目库变更
|
2022-10-14 15:18:01 +08:00 |
|
|
sunFlower
|
6686bd3b1c
|
修改选人组件
|
2022-10-12 12:13:36 +08:00 |
|
|
sunFlower
|
d7aaf663f8
|
修改选人组件
|
2022-10-11 14:20:04 +08:00 |
|
|
sunFlower
|
dafff274e1
|
修改禅道已知bug
|
2022-10-10 17:06:57 +08:00 |
|
|
sunFlower
|
1ec0784eb6
|
修改禅道已知bug
|
2022-10-09 20:49:04 +08:00 |
|
|
sunFlower
|
d4f335717e
|
修改禅道已知bug
|
2022-09-29 14:53:57 +08:00 |
|
|
sunFlower
|
5b4c7f8cb0
|
修改禅道已知bug
|
2022-09-29 14:43:28 +08:00 |
|
|
高嵩
|
bcae7f63af
|
修改法规清单的备注和参数的编号名称限制字符
|
2022-09-23 14:50:59 +08:00 |
|
|
sunFlower
|
04aceb518b
|
1.修改三期优化点(图片预览)
|
2022-09-21 15:53:33 +08:00 |
|
|
zyx.net
|
a5fafde7c2
|
修改参数项收集清单 截止时间弹框
复制参数清单点击取消按钮无反应问题
|
2022-09-13 14:55:57 +08:00 |
|
|
liyawei
|
09f523dc3c
|
认证-参数项收集-前端定时暂存修改
|
2022-09-09 18:04:57 +08:00 |
|
|
范强强
|
8a7d667315
|
修改禅道已知bug
|
2022-09-08 20:27:56 +08:00 |
|
|
范强强
|
d8666bdd2d
|
修改禅道已知bug
|
2022-09-08 17:40:07 +08:00 |
|
|
范强强
|
1f659d5ddf
|
修改全局的取消按钮展示
|
2022-09-08 17:13:58 +08:00 |
|