Commit Graph
2238 Commits
Author SHA1 Message Date
高嵩 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
zyx.net e7258052d1 收集清单柱状图,收集清单下拉框宽度修改 2022-10-27 11:55:48 +08:00
sunFlower 60e585043f 修改禅道已知bug 2022-10-27 11:35:45 +08:00
zyx.net 55f74e8b64 1.收集清单柱状图,收集清单下拉框宽度修改
2.参数项收集清单填写人增加导入导出功能
2022-10-27 11:11:16 +08:00
sunFlower 54a63160b5 修改禅道已知bug 2022-10-27 11:09:33 +08:00
sunFlower 7a886825d2 修改禅道已知bug 2022-10-27 11:01:20 +08:00
sunFlower e2385b900f 修改法规月报的字段名称 2022-10-27 10:14:41 +08:00
sunFlower 78f7d3e008 修改禅道已知bug 2022-10-27 10:04:36 +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
高嵩 f9cc564ffc 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!210
2022-10-27 09:38:05 +08:00
sunFlower e61dadc20f 修改禅道已知bug 2022-10-26 17:47:20 +08:00
sunFlower 35e0310605 修改禅道已知bug 2022-10-26 17:41:28 +08:00
sunFlower 385d9fc993 修改禅道已知bug 2022-10-26 15:48:26 +08:00
sunFlower 9f104c564a 修改禅道已知bug 2022-10-26 15:47:20 +08:00
sunFlower 6fbee100fb 修改禅道已知bug 2022-10-26 15:14:14 +08:00
sunFlower ad691bd7cd 修改禅道已知bug 2022-10-26 14:59:22 +08:00
sunFlower e252bb2890 修改问题知识库 2022-10-26 11:43:23 +08:00
sunFlower 959dec533d 修改禅道已知bug 2022-10-26 10:47:37 +08:00
sunFlower 6a205514f8 修改禅道已知bug 2022-10-26 10:05:22 +08:00
sunFlower 58624887e7 修改禅道已知bug 2022-10-26 09:36:23 +08:00
sunFlower a7d65bddea 修改禅道已知bug 2022-10-26 09:28:49 +08:00
sunFlower f223ab39aa 修改禅道已知bug 2022-10-26 09:11:44 +08:00
sunFlower 853bceb72b 修改提出优化点 2022-10-25 17:39:51 +08:00
sunFlower dc38f9546f 修改参数列表 2022-10-25 15:27:00 +08:00
sunFlower 8ee8a95b04 修改参数列表 2022-10-25 13:47:18 +08:00
sunFlower 440cf115b3 修改消息通知 2022-10-25 09:44:34 +08:00
sunFlower 91af6e71c6 修改消息通知 2022-10-25 09:34:31 +08:00
sunFlower 7aeaa58063 修改法规月报的状态 2022-10-24 18:06:46 +08:00
sunFlower 826354dbdd 修改法规月报的链接字段长度 2022-10-24 17:40:03 +08:00
sunFlower 33343c438d 修改法规月报的链接字段长度 2022-10-24 15:47:58 +08:00
sunFlower 744cea784d 修改法规月报的链接字段长度 2022-10-24 15:00:20 +08:00
高嵩 01603d5f8a 合并代码待办中心 2022-10-24 15:00:19 +08:00