 sunFlower
|
d53a5289d2
|
修改禅道已知bug
|
2022-11-04 09:23:18 +08:00 |
|
|
高嵩
|
aed6f23880
|
合并代码
|
2022-11-03 15:32:47 +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
|
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
|
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
|
67b18a48a4
|
待办中心-认证参数-查询优化，添加待办标记
|
2022-11-02 19:53:12 +08:00 |
|
|
zyx.net
|
abe7dcafaa
|
参数收集待办任务跳转修改
|
2022-11-02 18:16:04 +08:00 |
|
|
CD
|
847d5ec527
|
1、定时器分页有问题 暂时先改成这样 用于测试
2、消息全部处理完毕
|
2022-11-02 17:02:55 +08:00 |
|
|
sunFlower
|
ca82a088eb
|
修改禅道已知bug
|
2022-11-02 15:29:54 +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 |
|
|
sunFlower
|
bc8ca6e924
|
修改禅道已知bug
|
2022-11-01 16:54:22 +08:00 |
|
|
sunFlower
|
f68a375893
|
修改禅道已知bug
|
2022-11-01 16:41:21 +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
|
2e798e417a
|
修改禅道已知bug
|
2022-11-01 15:59:37 +08:00 |
|
|
sunFlower
|
923e099599
|
修改禅道已知bug
|
2022-11-01 15:36:11 +08:00 |
|
|
sunFlower
|
691af95e43
|
修改禅道已知bug
|
2022-11-01 14:45:05 +08:00 |
|
|
zyx.net
|
adf6801f67
|
Merge remote-tracking branch 'origin/feature_dev_20221010_extend' into feature_dev_20221010_extend
|
2022-11-01 14:39:15 +08:00 |
|
|
zyx.net
|
56e7c0e8ee
|
填写人填写--控件类型为文本，控件校验为中文的，填写时没有字符长度限制
|
2022-11-01 14:38:40 +08:00 |
|
|
sunFlower
|
2214853d6a
|
修改禅道已知bug
|
2022-11-01 14:26:45 +08:00 |
|
|
sunFlower
|
58efb3b360
|
修改禅道已知bug
|
2022-11-01 14:14:54 +08:00 |
|
|
sunFlower
|
fc16d2328a
|
修改禅道已知bug
|
2022-11-01 12:07:21 +08:00 |
|
|
高嵩
|
fb87fa3f08
|
合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage
查看合并请求 laws-nio/laws-weilai!224
|
2022-10-31 15:47:33 +08:00 |
|
|
liyawei
|
b0dee96efa
|
认证-参数项收集-同步上报库时间字段取消角色限制
|
2022-10-31 10:06:20 +08:00 |
|
|
高嵩
|
e3b2fb4313
|
合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage
查看合并请求 laws-nio/laws-weilai!221
|
2022-10-28 16:36:24 +08:00 |
|
|
高嵩
|
d1cc66ebfa
|
合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test'
Feature dev 20221025 message
查看合并请求 laws-nio/laws-weilai!220
|
2022-10-28 16:35:53 +08:00 |
|
|
高嵩
|
9aaa654569
|
合并分支 'feature_dev_20221008_TODO' 到 'dev_2nd_period_test'
Feature dev 20221008 todo
查看合并请求 laws-nio/laws-weilai!219
|
2022-10-28 16:35:32 +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
|
b2b92f62e4
|
参数项收集清单，高级查询添加不能查询空条件提示
|
2022-10-28 15:11:37 +08:00 |
|
|
zyx.net
|
4808f7ef52
|
参数项收集清单，高级查询添加不能查询空条件提示
|
2022-10-28 14:59:45 +08:00 |
|
|
sunFlower
|
91a7cae62a
|
修改禅道已知bug
|
2022-10-28 11:54:29 +08:00 |
|
|
刘彦泽
|
b50d713948
|
修改中英文翻译
|
2022-10-28 11:52:45 +08:00 |
|
|
zyx.net
|
e3e14194e9
|
参数项收集清单填写人导出功能
|
2022-10-28 09:41:59 +08:00 |
|
|
sunFlower
|
8e70b640cc
|
修改禅道已知bug
|
2022-10-27 16:31:56 +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 |
|
|
高嵩
|
06d6b6d1c7
|
Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into dev_2nd_period_test
|
2022-10-27 15:22:49 +08:00 |
|
|
高嵩
|
8d75dbe38d
|
Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test
|
2022-10-27 15:22:04 +08:00 |
|
|
高嵩
|
8fd885a8fa
|
Merge remote-tracking branch 'origin/feature_dev_20221025_message' 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/views/processCenter/components/feedbackInformation.vue
# jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
|
2022-10-27 15:21:33 +08:00 |
|
|
高嵩
|
74c8efc643
|
合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage
查看合并请求 laws-nio/laws-weilai!212
|
2022-10-27 15:15:44 +08:00 |
|
|
sunFlower
|
ed5354b8a6
|
修改禅道已知bug
|
2022-10-27 14:15:39 +08:00 |
|
|
sunFlower
|
7dc56839b4
|
修改禅道已知bug
|
2022-10-27 14:09:46 +08:00 |
|