高嵩
|
fb87fa3f08
|
合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage
查看合并请求 laws-nio/laws-weilai!224
|
2022-10-31 15:47:33 +08:00 |
|
高嵩
|
c1fd7561cc
|
合并分支 'feature_dev_20221008_TODO' 到 'dev_2nd_period_test'
Feature dev 20221008 todo
查看合并请求 laws-nio/laws-weilai!223
|
2022-10-31 15:43:16 +08:00 |
|
liyawei
|
b0dee96efa
|
认证-参数项收集-同步上报库时间字段取消角色限制
|
2022-10-31 10:06:20 +08:00 |
|
liyawei
|
280ab37eaa
|
认证-参数项收集-同步上报库时间字段取消角色限制
|
2022-10-31 09:40:47 +08:00 |
|
liyawei
|
6372ba1f16
|
待办中心-认证参数-bug修改
|
2022-10-31 09:29:59 +08:00 |
|
liyawei
|
22298bd0a1
|
Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into feature_dev_20221008_TODO
|
2022-10-28 16:52:30 +08:00 |
|
liyawei
|
2fb4296d13
|
待办中心-认证参数-回显相关版本
|
2022-10-28 16:52:15 +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 |
|
高嵩
|
11d88d617f
|
合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend
查看合并请求 laws-nio/laws-weilai!218
|
2022-10-28 16:34:56 +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 |
|
CD
|
010cce78e8
|
Merge remote-tracking branch 'origin/feature_dev_20221025_message' into feature_dev_20221025_message
|
2022-10-28 16:31:38 +08:00 |
|
CD
|
c1e6fd2e80
|
bug 61985、61981、61980、61964
|
2022-10-28 16:30:59 +08:00 |
|
zhn
|
3963b58f72
|
文档编辑--订阅领域发消息
|
2022-10-28 15:52:58 +08:00 |
|
zhn
|
702d372c1d
|
新增法规给订阅领域人员发消息
|
2022-10-28 15:41:19 +08:00 |
|
liyawei
|
be6b421f03
|
认证-参数清单-配置名称限制不能重复校验
|
2022-10-28 15:35:57 +08:00 |
|
CD
|
5ac47feeda
|
Merge remote-tracking branch 'origin/feature_dev_20221025_message' into feature_dev_20221025_message
|
2022-10-28 15:23:20 +08:00 |
|
CD
|
d57c149b57
|
bug61968
|
2022-10-28 15:22:28 +08:00 |
|
liyawei
|
44d8dea8a7
|
Merge remote-tracking branch 'origin/feature_dev_20221010_extend' into feature_dev_20221010_extend
|
2022-10-28 15:12:30 +08:00 |
|
liyawei
|
a5152885f9
|
认证-参数收集清单-填写人导出导入修改
|
2022-10-28 15:12:07 +08:00 |
|
zyx.net
|
b2b92f62e4
|
参数项收集清单,高级查询添加不能查询空条件提示
|
2022-10-28 15:11:37 +08:00 |
|
zhn
|
be633ddaa6
|
文档订阅--编辑时发消息
|
2022-10-28 15:06:25 +08:00 |
|
zyx.net
|
90810956fa
|
Merge remote-tracking branch 'origin/feature_dev_20221010_extend' into feature_dev_20221010_extend
|
2022-10-28 15:00:37 +08:00 |
|
zyx.net
|
4808f7ef52
|
参数项收集清单,高级查询添加不能查询空条件提示
|
2022-10-28 14:59:45 +08:00 |
|
CD
|
43b3d9f7c5
|
需求说去掉
|
2022-10-28 14:37:56 +08:00 |
|
liyawei
|
3866b52dcc
|
认证-参数收集清单-填写人导出导入
|
2022-10-28 14:18:52 +08:00 |
|
CD
|
53c1b335dd
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-10-28 13:01:17 +08:00 |
|
CD
|
b2cfbe20d0
|
bug
|
2022-10-28 13:00:51 +08:00 |
|
sunFlower
|
91a7cae62a
|
修改禅道已知bug
|
2022-10-28 11:54:29 +08:00 |
|
刘彦泽
|
b50d713948
|
修改中英文翻译
|
2022-10-28 11:52:45 +08:00 |
|
zhn
|
19b4df8634
|
法规预警定时任务--飞书消息
|
2022-10-28 09:53:33 +08:00 |
|
高嵩
|
419e4c9be2
|
Merge remote-tracking branch 'origin/feature_dev_20221025_message' into dev_2nd_period_test
# Conflicts:
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
|
2022-10-28 09:52:04 +08:00 |
|
zyx.net
|
e3e14194e9
|
参数项收集清单填写人导出功能
|
2022-10-28 09:41:59 +08:00 |
|
liyawei
|
3c7d85a3e9
|
认证-参数收集清单-填写人导出导入
|
2022-10-28 09:17:21 +08:00 |
|
zhn
|
df5d6f7987
|
法规预警推送
|
2022-10-27 16:54:56 +08:00 |
|
sunFlower
|
8e70b640cc
|
修改禅道已知bug
|
2022-10-27 16:31:56 +08:00 |
|
wangzhijiang
|
2117f226a5
|
待办中心-查询完善。
|
2022-10-27 15:26:06 +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 |
|
CD
|
9a14490f84
|
法规意见收集模块消息改造完毕
|
2022-10-27 15:18:42 +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 |
|
wangzhijiang
|
5c1f217dcb
|
待办中心-查询完善。
|
2022-10-27 15:13:39 +08:00 |
|
zhn
|
5701e0e59f
|
主要内容--设置页边距, 内容预留空格
|
2022-10-27 15:06:16 +08:00 |
|
zhn
|
73f67a1d3b
|
月报导出--数据字典换行
|
2022-10-27 14:51:43 +08:00 |
|
高嵩
|
09cb1b2210
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-10-27 14:23:27 +08:00 |
|
高嵩
|
0b13133720
|
空指针
|
2022-10-27 14:23:10 +08:00 |
|
zhn
|
b511a20216
|
月报导出与标题模板顺序一致
|
2022-10-27 14:19:30 +08:00 |
|