 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 |
|
|
高嵩
|
f4eb47f707
|
合并分支 'dev_third_stage' 到 'master'
修改中英文翻译
查看合并请求 laws-nio/laws-weilai!216
|
2022-10-28 12:16:03 +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 |
|
|
高嵩
|
a086785f77
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!214
|
2022-10-27 20:55:47 +08:00 |
|
|
zhn
|
df5d6f7987
|
法规预警推送
|
2022-10-27 16:54:56 +08:00 |
|
|
sunFlower
|
8e70b640cc
|
修改禅道已知bug
|
2022-10-27 16:31:56 +08:00 |
|
|
wangzhijiang
|
1b65105f8f
|
规避法规意见收集导出空数据报错问题。
|
2022-10-27 15:49:11 +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 |
|
|
sunFlower
|
ed5354b8a6
|
修改禅道已知bug
|
2022-10-27 14:15:39 +08:00 |
|
|
wangzhijiang
|
a6e36cfd51
|
Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into feature_dev_20221008_TODO
|
2022-10-27 14:12:20 +08:00 |
|
|
wangzhijiang
|
99364d52f3
|
法规评估任务处理标准信息展示。拼接中英文展示 与查询处理。
|
2022-10-27 14:11:33 +08:00 |
|
|
sunFlower
|
7dc56839b4
|
修改禅道已知bug
|
2022-10-27 14:09:46 +08:00 |
|
|
zyx.net
|
e7258052d1
|
收集清单柱状图，收集清单下拉框宽度修改
|
2022-10-27 11:55:48 +08:00 |
|
|
sunFlower
|
60e585043f
|
修改禅道已知bug
|
2022-10-27 11:35:45 +08:00 |
|
|
wangzhijiang
|
745a8b81e3
|
Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into feature_dev_20221008_TODO
|
2022-10-27 11:27:30 +08:00 |
|
|
wangzhijiang
|
b2100c360f
|
61842-待办中心已办/已发 排序按照截止时间倒序排列
|
2022-10-27 11:26:59 +08:00 |
|
|
zyx.net
|
55f74e8b64
|
1.收集清单柱状图，收集清单下拉框宽度修改
2.参数项收集清单填写人增加导入导出功能
|
2022-10-27 11:11:16 +08:00 |
|
|
zhn
|
99f733ec97
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-10-27 11:10:27 +08:00 |
|
|
zhn
|
6580ac32ac
|
月报填写不设置权限
|
2022-10-27 11:10:03 +08:00 |
|
|
sunFlower
|
54a63160b5
|
修改禅道已知bug
|
2022-10-27 11:09:33 +08:00 |
|
|
sunFlower
|
7a886825d2
|
修改禅道已知bug
|
2022-10-27 11:01:20 +08:00 |
|
|
zhn
|
ddc97405cc
|
页眉添加期数
|
2022-10-27 10:57:00 +08:00 |
|
|
CD
|
835c005f6c
|
法规技术评估模块消息完毕
|
2022-10-27 10:30:23 +08:00 |
|
|
sunFlower
|
e2385b900f
|
修改法规月报的字段名称
|
2022-10-27 10:14:41 +08:00 |
|