WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,534 Commits 1 Branch 0 Tags
491dd13e4d5b3cc9ef2900a4ba9ce80cdd9e3193
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
高嵩 491dd13e4d 处理导出参数清单空指针问题。 2023-01-06 16:56:21 +08:00
高嵩 3643370ec1 处理导出参数清单空指针问题。 2023-01-06 16:54:51 +08:00
高嵩 7f5633d885 合并分支 'feature_dev_20221129_UI' 到 'master' 
UI界面变更-首页

查看合并请求 laws-nio/laws-weilai!270
 2022-12-30 20:16:42 +08:00
高嵩 0f09c75dce 合并分支 'fix_2nd_period' 到 'master' 
Fix 2nd period

查看合并请求 laws-nio/laws-weilai!269
 2022-12-30 20:16:28 +08:00
高嵩 195417c2d8 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 15:53:54 +08:00
高嵩 b0b8f36e92 Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period 
# Conflicts:
#	jero-web/src/components/tableCollection/index1.vue
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/index.vue
 2022-12-30 15:53:39 +08:00
高嵩 07c02abef6 同步上产数据库结构 2022-12-30 15:36:04 +08:00
高嵩 ca074ee4c6 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:54:11 +08:00
高嵩 63ef89834e 文档拆分 上移下移按钮权限 2022-12-30 14:54:00 +08:00
高嵩 76f958ae74 用户管理 角色配置品牌选择框 2022-12-30 11:23:43 +08:00
高嵩 f4c4769707 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-29 17:37:26 +08:00
高嵩 6118ecfea6 Merge remote-tracking branch 'origin/dev_2nd_period_test' into fix_2nd_period 2022-12-29 17:37:10 +08:00
高嵩 2e801f5bca 合并dev代码 2022-12-29 10:22:43 +08:00
高嵩 3c8cfab750 Merge remote-tracking branch 'origin/dev_2nd_period_test' into fix_2nd_period 2022-12-29 10:21:36 +08:00
高嵩 f4d1b8676a Merge remote-tracking branch 'origin/feature_dev_20221125_YW' into fix_2nd_period 
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
 2022-12-28 09:58:11 +08:00
高嵩 4633d465f3 Merge branch 'dev_2nd_period_test' into fix_2nd_period 
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	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/ParamsCollectManifestEOMapper.xml
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
#	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/listOfRegulations.vue
 2022-12-28 09:53:38 +08:00
高嵩 34359f65a5 去掉暂存的AutoLog 2022-12-28 09:34:10 +08:00
高嵩 e6af832e7f Merge branch 'fix_2nd_period' 
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
 2022-12-16 17:55:57 +08:00
高嵩 9013372b87 修改月报模版Mandatory if fitted改为if fitted 2022-12-16 17:55:05 +08:00
高嵩 39c2b5c5a8 待办中心-项目参数任务，跳转修改 2022-12-16 10:11:25 +08:00
高嵩 a02ce9859c 合并分支 'feature_dev_20221125_YW' 到 'master' 
临时修改搜索编号导致的参数重复问题

查看合并请求 laws-nio/laws-weilai!263
 2022-12-14 18:24:26 +08:00
高嵩 936f1000f5 临时修改搜索编号导致的参数重复问题 2022-12-14 18:23:57 +08:00
高嵩 9e2cca56dd 合并分支 'feature_dev_20221125_YW' 到 'master' 
上报库编辑明细，历史记录中value值加引号。

查看合并请求 laws-nio/laws-weilai!262
 2022-12-13 17:48:32 +08:00
高嵩 6500138de7 合并分支 'feature_dev_20221125_YW' 到 'master' 
上报库导出明细，带历史Log-处理空指针。

查看合并请求 laws-nio/laws-weilai!261
 2022-12-12 21:00:00 +08:00
高嵩 2aa8caff0f 同步生产数据库 2022-12-12 20:06:03 +08:00
高嵩 10225bd54b 合并分支 'feature_dev_20221125_YW' 到 'master' 
上报库修改数据，存历史Log逻辑修改。

查看合并请求 laws-nio/laws-weilai!260
 2022-12-12 19:45:32 +08:00
高嵩 d80860f28e 上报库修改数据，存历史Log逻辑修改。 2022-12-12 19:44:53 +08:00
高嵩 ad1189fed7 合并分支 'feature_dev_20221125_YW' 到 'master' 
Feature dev 20221125 yw

查看合并请求 laws-nio/laws-weilai!259
 2022-12-12 19:42:15 +08:00
高嵩 69e5e572b3 1.责任领域空默认显示-- 
2.修改责任领域回显清空
 2022-12-12 17:20:21 +08:00
高嵩 f19408d25f 合并分支 'feature_dev_20221125_YW' 到 'master' 
Feature dev 20221125 yw

查看合并请求 laws-nio/laws-weilai!257
 2022-12-11 16:23:18 +08:00
高嵩 9ed72c6075 合并分支 'fix_2nd_period' 到 'master' 
Fix 2nd period

查看合并请求 laws-nio/laws-weilai!256
 2022-12-01 18:57:48 +08:00
gaosong cb5a60a873 修改项目状态看板项目排序 2022-12-01 18:52:14 +08:00
高嵩 afac55b76e 合并分支 'fix_2nd_period' 到 'master' 
Fix 2nd period

查看合并请求 laws-nio/laws-weilai!255
 2022-11-28 22:52:06 +08:00
高嵩 e936d6d1b1 合并分支 'fix_2nd_period' 到 'master' 
修改我的收藏的问题知识库

查看合并请求 laws-nio/laws-weilai!254
 2022-11-24 21:30:57 +08:00
高嵩 cfe9bf5064 合并分支 'fix_2nd_period' 到 'master' 
Fix 2nd period

查看合并请求 laws-nio/laws-weilai!253
 2022-11-24 20:29:09 +08:00
高嵩 0592c2fee8 合并分支 'fix_2nd_period' 到 'master' 
Fix 2nd period

查看合并请求 laws-nio/laws-weilai!252
 2022-11-22 20:56:09 +08:00
高嵩 6529b4ed52 修改优化点 2022-11-22 15:55:26 +08:00
高嵩 e1a971fa71 修改优化点 2022-11-22 15:21:27 +08:00
高嵩 e39bc35d79 修改优化点 2022-11-22 14:36:20 +08:00
高嵩 596ccc7cf6 合并分支 'fix_2nd_period' 到 'master' 
修改切换英文项目法规清单无数据问题

查看合并请求 laws-nio/laws-weilai!251
 2022-11-21 13:27:06 +08:00
高嵩 3826c3baff 修改切换英文项目法规清单无数据问题 2022-11-21 13:26:42 +08:00
高嵩 47eb72c5e6 合并分支 'fix_2nd_period' 到 'master' 
Fix 2nd period

查看合并请求 laws-nio/laws-weilai!250
 2022-11-18 18:36:03 +08:00
高嵩 0337a85e84 合并分支 'dev_2nd_period_test' 到 'master' 
修改问题知识库搜索null的id问题

查看合并请求 laws-nio/laws-weilai!248
 2022-11-11 12:31:48 +08:00
高嵩 9c88a2b615 修改问题知识库搜索null的id问题 2022-11-11 12:31:19 +08:00
高嵩 2e14fec213 合并分支 'dev_2nd_period_test' 到 'master' 
首页流程跳转

查看合并请求 laws-nio/laws-weilai!247
 2022-11-11 10:46:44 +08:00
高嵩 4c7db3b451 合并分支 'dev_2nd_period_test' 到 'master' 
修改问题知识库搜索中心保存知识分享

查看合并请求 laws-nio/laws-weilai!246
 2022-11-11 10:34:43 +08:00
高嵩 db04a93b40 修改问题知识库搜索中心保存知识分享 2022-11-11 09:17:59 +08:00
高嵩 dc25039563 合并分支 'dev_2nd_period_test' 到 'master' 
修改中英文翻译

查看合并请求 laws-nio/laws-weilai!245
 2022-11-10 20:41:27 +08:00
高嵩 88c1cc67ca 合并分支 'dev_2nd_period_test' 到 'master' 
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!244
 2022-11-10 16:58:33 +08:00
高嵩 8d3c533faf 合并分支 'dev_2nd_period_test' 到 'master' 
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!243
 2022-11-09 20:31:44 +08:00
高嵩 e8223399ac Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test 2022-11-09 18:06:18 +08:00
高嵩 8f01dc1481 同步数据库 2022-11-09 18:06:09 +08:00
高嵩 3bac043816 合并分支 'dev_third_stage' 到 'master' 
修改

查看合并请求 laws-nio/laws-weilai!242
 2022-11-08 21:35:24 +08:00
高嵩 7c1012155d 合并分支 'dev_2nd_period_test' 到 'master' 
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!241
 2022-11-08 20:34:27 +08:00
高嵩 713c935304 合并分支 'dev_third_stage' 到 'master' 
修改问题知识库的显示方式

查看合并请求 laws-nio/laws-weilai!240
 2022-11-08 20:34:06 +08:00
高嵩 acfea6db37 问题知识库-展示文件-按照创建时间正序排序。 2022-11-07 14:58:44 +08:00
高嵩 f077570f80 待办中心-项目名称展示修改。 2022-11-07 14:48:37 +08:00
高嵩 dbf9de9251 合并分支 'dev_2nd_period_test' 到 'master' 
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!239
 2022-11-04 19:18:18 +08:00
高嵩 06ef963a48 合并分支 'feature_dev_20221008_TODO' 到 'master' 
Feature dev 20221008 todo

查看合并请求 laws-nio/laws-weilai!238
 2022-11-04 18:05:02 +08:00
高嵩 b25cff8964 合并分支 'dev_2nd_period_test' 到 'master' 
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!237
 2022-11-04 18:04:37 +08:00
高嵩 5d9b1951df 修改优化点 2022-11-04 17:56:03 +08:00
高嵩 c21936171c 修改文档拆分详情左侧树的弹框输入框大小 2022-11-04 17:31:50 +08:00
高嵩 07b3db70e2 合并分支 'dev_2nd_period_test' 到 'master' 
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!236
 2022-11-04 13:45:47 +08:00
高嵩 9e5753032b 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test' 
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!235
 2022-11-04 10:19:03 +08:00
高嵩 09ba8e6f77 合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test' 
Feature dev 20221025 message

查看合并请求 laws-nio/laws-weilai!234
 2022-11-03 15:35:18 +08:00
高嵩 aed6f23880 合并代码 2022-11-03 15:32:47 +08:00
高嵩 18eb5b1710 Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into feature_dev_20221008_TODO 2022-11-03 14:45:22 +08:00
高嵩 dc91107df3 62175问题处理-已发流程中不展示自己的数据 2022-11-03 14:45:05 +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
高嵩 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
高嵩 1e3a5b585a 修改上传文件名字符限制70变为100 2022-11-01 10:55:17 +08:00
高嵩 b34f623586 合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test' 
Feature dev 20221025 message

查看合并请求 laws-nio/laws-weilai!225
 2022-10-31 15:48:00 +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
高嵩 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
高嵩 8e392b22d9 合并分支 'dev_third_stage' 到 'master' 
认证-参数清单-配置名称限制不能重复校验

查看合并请求 laws-nio/laws-weilai!222
 2022-10-28 16:37:27 +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
高嵩 c22fd75fbb 合并分支 'dev_third_stage' 到 'master' 
Dev third stage

查看合并请求 laws-nio/laws-weilai!217
 2022-10-28 15:18:52 +08:00
高嵩 f4eb47f707 合并分支 'dev_third_stage' 到 'master' 
修改中英文翻译

查看合并请求 laws-nio/laws-weilai!216
 2022-10-28 12:16:03 +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
高嵩 a086785f77 合并分支 'dev_third_stage' 到 'master' 
Dev third stage

查看合并请求 laws-nio/laws-weilai!214
 2022-10-27 20:55:47 +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
高嵩 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
高嵩 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
高嵩 625aa37f3d 合并分支 'dev_third_stage' 到 'master' 
Dev third stage

查看合并请求 laws-nio/laws-weilai!204
 2022-10-25 22:12:01 +08:00
高嵩 0e9f507852 法规意见收集、法规技术评估导出完善。 2022-10-25 16:04:21 +08:00
高嵩 5511ef9f48 合并分支 'dev_third_stage' 到 'master' 
修改法规月报的链接字段长度

查看合并请求 laws-nio/laws-weilai!200
 2022-10-24 15:49:25 +08:00