WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,973 Commits 1 Branch 0 Tags
d1f53980166a8ba4fe0c173471a536f8735013ad
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
高嵩 77f0210811 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-20 09:14:24 +08:00
高嵩 8667d76838 Merge branch 'feature_dev_20230222_FJDSS' into dev_2nd_LCYH 
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
 2023-03-20 09:13:21 +08:00
高嵩 2ed75c2a5a 提交OTA 生成代码 2023-03-17 15:45:03 +08:00
高嵩 259227177c 修改sql同步信息 2023-02-27 19:00:06 +08:00
高嵩 97334963cf 合并分支 'dev_2nd_20230213' 到 'master' 
Dev 2nd 20230213

查看合并请求 laws-nio/laws-weilai!294
 2023-02-27 18:11:03 +08:00
高嵩 3dedbf3de1 Merge remote-tracking branch 'origin/dev_2nd_20230213' into dev_2nd_20230213 2023-02-22 10:16:11 +08:00
高嵩 b2d7f5b3a6 法规清单自定义表头修改 2023-02-22 10:13:49 +08:00
高嵩 c4522229e1 合并分支 'dev_2nd_20230213' 到 'master' 
Dev 2nd 20230213

查看合并请求 laws-nio/laws-weilai!293
 2023-02-17 17:21:14 +08:00
高嵩 3e8401a979 合并分支 'fix_2nd_20230103' 到 'master' 
参数收集清单 定时器问题

查看合并请求 laws-nio/laws-weilai!292
 2023-02-17 17:20:44 +08:00
高嵩 0d14076a58 Merge remote-tracking branch 'origin/dev_2nd_20230213' into dev_2nd_20230213 2023-02-17 17:16:11 +08:00
高嵩 a6febe3e63 法规预警搜索条件修改 2023-02-17 17:15:40 +08:00
高嵩 d1748f29c5 1.高级搜索 日期类型控件修改 
2.法规预警搜索条件修改
 2023-02-17 16:07:11 +08:00
高嵩 d2c1d32bfd 合并分支 'dev_2nd_20230213' 到 'master' 
Dev 2nd 20230213

查看合并请求 laws-nio/laws-weilai!291
 2023-02-14 14:10:26 +08:00
高嵩 3504521f66 自定义表头修改 2023-02-14 14:09:17 +08:00
高嵩 beaf0c8d1b Merge remote-tracking branch 'origin/dev_2nd_20230213' into dev_2nd_20230213 
# Conflicts:
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
 2023-02-14 14:08:42 +08:00
高嵩 733a7d0c2a 自定义表头修改 2023-02-14 14:06:03 +08:00
高嵩 7fab5980a7 自定义表头修改 2023-02-14 10:45:53 +08:00
高嵩 161bf6e87a 自定义表头修改为列表设置 
用户管理修改
 2023-02-14 10:08:18 +08:00
高嵩 95bd1395f9 合并分支 'dev_2nd_20230213' 到 'master' 
Dev 2nd 20230213

查看合并请求 laws-nio/laws-weilai!290
 2023-02-14 09:34:42 +08:00
高嵩 ffc89b63f1 虚拟清单表头自定义修改 2023-02-14 09:34:04 +08:00
高嵩 971def33fb 用户管理编辑提交报错问题 2023-02-14 09:26:18 +08:00
高嵩 6f6a428c83 合并分支 'dev_2nd_20230213' 到 'master' 
Dev 2nd 20230213

查看合并请求 laws-nio/laws-weilai!289
 2023-02-13 21:45:48 +08:00
高嵩 f27866dc4a Merge remote-tracking branch 'origin/dev_2nd_20230213' into dev_2nd_20230213 2023-02-13 21:44:58 +08:00
高嵩 c755f1c73e 修改自定义表头BUG 2023-02-13 21:44:37 +08:00
高嵩 9e02994575 合并分支 'dev_2nd_20230213' 到 'master' 
Dev 2nd 20230213

查看合并请求 laws-nio/laws-weilai!288
 2023-02-13 17:43:20 +08:00
高嵩 5ed44e0e11 修改法规预警去除默认六个月 2023-02-13 16:19:42 +08:00
高嵩 c83163f513 Merge remote-tracking branch 'origin/dev_2nd_20230213' into dev_2nd_20230213 2023-02-13 15:41:28 +08:00
高嵩 50f3ee4159 修改未符合项中文档编号跳转文档库详情 2023-02-13 15:41:15 +08:00
高嵩 4505f05c8b 法规清单和参数收集清单责任领域搜索条件放到外面 2023-02-13 15:08:29 +08:00
高嵩 25e05dca21 知识分享 修改联系作者 2023-02-13 14:52:43 +08:00
高嵩 e9ca371264 修改自定义表头按钮位置 2023-02-13 14:20:55 +08:00
高嵩 5593c2f3b7 Merge remote-tracking branch 'origin/dev_2nd_20230213' into dev_2nd_20230213 2023-02-13 14:18:52 +08:00
高嵩 0df1e1f707 表头自定义修改默认表头 2023-02-13 14:18:37 +08:00
高嵩 25370a0857 修改表头拖拽 2023-02-13 10:50:41 +08:00
高嵩 5934894899 修改报错 2023-02-13 10:11:56 +08:00
高嵩 e442b36b6b 修改报错 2023-02-13 10:02:09 +08:00
高嵩 8c3f610b04 Merge remote-tracking branch 'origin/feature_dev_20230109_BTTZ' into dev_2nd_20230213 
# Conflicts:
#	jero-web/src/mixins/header.js
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/customizeList.vue
 2023-02-13 09:51:53 +08:00
高嵩 72fe8d8ca3 Merge remote-tracking branch 'origin/fix_2nd_period' 
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
 2023-02-11 22:21:03 +08:00
高嵩 db2259d285 合并分支 'feature_dev_20230105_ZDYBT' 到 'master' 
Feature dev 20230105 zdybt

查看合并请求 laws-nio/laws-weilai!286
 2023-02-11 22:13:17 +08:00
高嵩 78332f7c90 Merge remote-tracking branch 'origin/master' 2023-02-11 22:11:49 +08:00
高嵩 5d5034491e 合并分支 'fix_2nd_20230103' 到 'master' 
Fix 2nd 20230103

查看合并请求 laws-nio/laws-weilai!285
 2023-02-11 22:11:08 +08:00
高嵩 b43cc4a60f Merge branch 'feature_dev_20230105_ZDYBT' 
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/projectManagement/components/customizeList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
 2023-02-11 22:10:12 +08:00
高嵩 4424ee1540 合并分支 'feature_dev_20221129_UI' 到 'master' 
Feature dev 20221129 ui

查看合并请求 laws-nio/laws-weilai!283
 2023-02-11 21:51:40 +08:00
高嵩 9ddd197ea5 设计符合性流程发送消息-截至时间错误修改。 2023-02-08 14:04:25 +08:00
高嵩 5ad54639e1 合并分支 'revert-0fc81dd9' 到 'master' 
撤销 "Merge branch 'feature_20221014_noLogo' into 'master'"

查看合并请求 laws-nio/laws-weilai!281
 2023-02-03 15:19:27 +08:00
高嵩 666bcc10ff 撤销 "Merge branch 'feature_20221014_noLogo' into 'master'" 
这将还原提交 0fc81dd9fa
 2023-02-03 15:19:11 +08:00
高嵩 0fc81dd9fa Merge branch 'feature_20221014_noLogo' into 'master' 
# Conflicts:
#   jero-web/src/views/projectManagement/components/TaskList.vue
 2023-02-03 10:30:13 +08:00
高嵩 ff127719c5 合并分支 'fix_2nd_20230103' 到 'master' 
Fix 2nd 20230103

查看合并请求 laws-nio/laws-weilai!279
 2023-01-13 17:23:59 +08:00
高嵩 ebf3bc186e 法规技术评估结果 列表居左 2023-01-13 11:26:35 +08:00
高嵩 770bd8a418 更新sql 2023-01-13 08:59:56 +08:00
高嵩 da302e52f8 Merge remote-tracking branch 'origin/fix_2nd_20230103' 
# Conflicts:
#	jero-web/src/views/projectManagement/components/listAddModel.vue
 2023-01-12 21:09:27 +08:00
高嵩 8e94c26f09 Merge remote-tracking branch 'origin/fix_2nd_20230103' into fix_2nd_20230103 2023-01-12 18:41:56 +08:00
高嵩 c57ec9ff59 修改UI 2023-01-12 18:41:45 +08:00
高嵩 6442b4d255 合并分支 'feature_dev_20221129_UI' 到 'feature_dev_20230109_BTTZ' 
Feature dev 20221129 ui

查看合并请求 laws-nio/laws-weilai!277
 2023-01-11 11:01:12 +08:00
高嵩 5dc21849c2 合并分支 'fix_2nd_20230103' 到 'master' 
Fix 2nd 20230103

查看合并请求 laws-nio/laws-weilai!276
 2023-01-09 21:41:25 +08:00
高嵩 19e8a632e3 用户管理 角色配置 viewer责任领域配置bug 2023-01-09 21:40:30 +08:00
高嵩 d3d9e8eb2b 合并分支 'fix_2nd_20230103' 到 'master' 
用户管理 角色配置 viewer责任领域配置bug

查看合并请求 laws-nio/laws-weilai!275
 2023-01-09 15:36:13 +08:00
高嵩 c2239e216e 用户管理 角色配置 viewer责任领域配置bug 2023-01-09 15:34:37 +08:00
高嵩 8574bb3849 合并分支 'feature_dev_20221129_UI' 到 'master' 
Feature dev 20221129 ui

查看合并请求 laws-nio/laws-weilai!274
 2023-01-07 08:19:05 +08:00
高嵩 6ce825174a 合并分支 'fix_2nd_20230103' 到 'master' 
Fix 2nd 20230103

查看合并请求 laws-nio/laws-weilai!273
 2023-01-07 08:18:38 +08:00
高嵩 491dd13e4d 处理导出参数清单空指针问题。 2023-01-06 16:56:21 +08:00
高嵩 3643370ec1 处理导出参数清单空指针问题。 2023-01-06 16:54:51 +08:00
高嵩 45ce6c2a1e 合并分支 'fix_2nd_period' 到 'master' 
Fix 2nd period

查看合并请求 laws-nio/laws-weilai!272
 2023-01-03 13:57:52 +08:00
高嵩 ba80c8619e 合并分支 'fix_2nd_20230103' 到 'master' 
知识分享-联系创建人-获取用户飞书信息接口修改。

查看合并请求 laws-nio/laws-weilai!271
 2023-01-03 13:57:29 +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