 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 |
|
|
CD
|
847d5ec527
|
1、定时器分页有问题 暂时先改成这样 用于测试
2、消息全部处理完毕
|
2022-11-02 17:02:55 +08:00 |
|
|
liyawei
|
7e25c23cec
|
待办中心-认证参数-查询优化，添加待办标记
|
2022-11-02 16:36:23 +08:00 |
|
|
CD
|
54eb3d681a
|
清单催办(excel中没有，但是需求让加上)
|
2022-11-02 15:57:11 +08:00 |
|
|
liyawei
|
30acdf38e7
|
待办中心-认证参数-查询优化，添加待办标记
|
2022-11-02 15:44:16 +08:00 |
|
|
zhn
|
94152bb38b
|
小铃铛未读消息
|
2022-11-02 15:44:10 +08:00 |
|
|
sunFlower
|
ca82a088eb
|
修改禅道已知bug
|
2022-11-02 15:29:54 +08:00 |
|
|
CD
|
d69a33e6a7
|
Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test
|
2022-11-02 15:18:46 +08:00 |
|
|
CD
|
6500ed6a4e
|
preHomo、验证符合性定时任务
|
2022-11-02 15:18:00 +08:00 |
|
|
wangzhijiang
|
8969a36e33
|
Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test
|
2022-11-02 14:34:34 +08:00 |
|
|
wangzhijiang
|
0f0c2d3633
|
问题知识库新增修改。
|
2022-11-02 14:34:13 +08:00 |
|
|
CD
|
02a8dcca28
|
设计符合性确认定时器+催办调整
|
2022-11-02 14:15:16 +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 |
|
|
高嵩
|
68170c14bc
|
合并分支 'feature_dev_20221008_TODO' 到 'dev_2nd_period_test'
Feature dev 20221008 todo
查看合并请求 laws-nio/laws-weilai!229
|
2022-11-02 09:09:11 +08:00 |
|
|
高嵩
|
9dfba153e1
|
合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test'
问题知识库--发布发消息
查看合并请求 laws-nio/laws-weilai!228
|
2022-11-02 09:08:40 +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 |
|
|
CD
|
9e0af6b144
|
发起人催办责任人
|
2022-11-01 18:07:14 +08:00 |
|
|
zhn
|
d9c55c95b6
|
项目库添加版本搜索
|
2022-11-01 17:44:50 +08:00 |
|
|
wangzhijiang
|
d2c5811bed
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-11-01 17:42:51 +08:00 |
|
|
wangzhijiang
|
47abdbe613
|
61541 - 项目未符合项跟踪，系统管理员拥有最大权限，其它角色的用户只能查看跟自己相关的数据。
|
2022-11-01 17:42:31 +08:00 |
|
|
liyawei
|
d69330f087
|
认证-参数收集清单-填写人导出bug修改
|
2022-11-01 16:57:40 +08:00 |
|
|
sunFlower
|
bc8ca6e924
|
修改禅道已知bug
|
2022-11-01 16:54:22 +08:00 |
|
|
wangzhijiang
|
a551db8911
|
61712：法规符合性看板-增加数据权限：如果当前登录用户，是工程师、工程接口人角色，只能查看到跟自己相关的数据。其余角色保留之前的查询结果。
|
2022-11-01 16:49:22 +08:00 |
|
|
wangzhijiang
|
a4f9bec0d9
|
符合性流程-查询反馈意见处理userId
|
2022-11-01 16:48:11 +08:00 |
|
|
wangzhijiang
|
4c3c87cdde
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-11-01 16:46:40 +08:00 |
|
|
wangzhijiang
|
0b2ae6fb92
|
符合性流程，查询反馈信息，处理用户id
|
2022-11-01 16:46:01 +08:00 |
|
|
sunFlower
|
f68a375893
|
修改禅道已知bug
|
2022-11-01 16:41:21 +08:00 |
|