 高嵩
|
de17ee6a93
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
|
2023-03-25 21:05:31 +08:00 |
|
|
高嵩
|
ba41f840e1
|
开发OTA备案工具
|
2023-03-25 21:05:23 +08:00 |
|
|
高嵩
|
297144bf86
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
|
2023-03-25 19:43:31 +08:00 |
|
|
高嵩
|
2dfdbb2318
|
开发OTA备案工具
|
2023-03-25 19:43:22 +08:00 |
|
|
高嵩
|
1603e61893
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
|
2023-03-25 19:26:14 +08:00 |
|
|
高嵩
|
d8715bf0ec
|
开发OTA备案工具
|
2023-03-25 19:26:06 +08:00 |
|
|
高嵩
|
8e5822a1c8
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
|
2023-03-25 14:14:15 +08:00 |
|
|
高嵩
|
ccfee1531d
|
开发OTA备案工具
|
2023-03-25 14:14:01 +08:00 |
|
|
高嵩
|
ed22c26c0a
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
|
2023-03-24 17:38:53 +08:00 |
|
|
高嵩
|
e115fc742e
|
Merge branch 'master' into dev_2nd_LCYH
# Conflicts:
# 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/document/service/impl/BussDocumentLibraryEOServiceImpl.java
# jero-web/src/common/lang/en-us.js
# jero-web/src/common/lang/zh-cn.js
# jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
# jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
# jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
# jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
# jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
|
2023-03-24 16:56:38 +08:00 |
|
|
高嵩
|
99f276f2c9
|
开发OTA备案工具 修改备案历史接口
|
2023-03-23 23:47:39 +08:00 |
|
|
高嵩
|
7cf1f441b4
|
修改认证清单转办时 接口人和责任人的项目权限
|
2023-03-23 23:27:50 +08:00 |
|
|
高嵩
|
eddac9197c
|
Merge remote-tracking branch 'origin/master'
|
2023-03-23 22:57:43 +08:00 |
|
|
高嵩
|
9759ea9851
|
合并分支 'fix_2nd_20230315' 到 'master'
Fix 2nd 20230315
查看合并请求 laws-nio/laws-weilai!299
|
2023-03-23 22:55:52 +08:00 |
|
|
高嵩
|
fe6dc3e74b
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
|
2023-03-23 15:51:35 +08:00 |
|
|
高嵩
|
4f6a11bb4d
|
ota管理 维护对接接口
|
2023-03-23 15:51:22 +08:00 |
|
|
高嵩
|
ef128a7eb0
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
|
2023-03-23 11:45:36 +08:00 |
|
|
高嵩
|
22a54fb9d3
|
修改认证清单添加和导入数据时 接口人和责任人的项目权限
|
2023-03-23 11:45:26 +08:00 |
|
|
高嵩
|
bd6912b229
|
开发OTA备案工具 添加备案历史接口
|
2023-03-22 22:01:06 +08:00 |
|
|
高嵩
|
cdbce3e10e
|
开发OTA备案工具 添加备案历史接口
|
2023-03-22 21:59:43 +08:00 |
|
|
高嵩
|
956c2e3db5
|
开发OTA备案工具 添加备案历史接口
|
2023-03-22 21:41:49 +08:00 |
|
|
高嵩
|
d29009827b
|
修改UAT问题 修改代替标准逻辑
|
2023-03-22 20:33:57 +08:00 |
|
|
高嵩
|
6523f968cb
|
修改催办问题
|
2023-03-22 16:21:52 +08:00 |
|
|
高嵩
|
fac240edbe
|
修复知识分享 搜索中心跳转
|
2023-03-22 10:47:22 +08:00 |
|
|
高嵩
|
bf9e3a2255
|
合并分支 'fix_2nd_20230315' 到 'master'
Fix 2nd 20230315
查看合并请求 laws-nio/laws-weilai!298
|
2023-03-22 09:20:04 +08:00 |
|
|
高嵩
|
a34d0f908e
|
修改项目库版本号重复后排序
|
2023-03-22 09:18:19 +08:00 |
|
|
高嵩
|
810eaf8173
|
修复搜索中心跳转知识分享
|
2023-03-22 09:17:49 +08:00 |
|
|
高嵩
|
e1086d5cc6
|
修复合并问题
|
2023-03-20 10:50:59 +08:00 |
|
|
高嵩
|
787cf7b49c
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
|
2023-03-20 10:27:08 +08:00 |
|
|
高嵩
|
f2a1ac87b3
|
Merge branch 'feature_dev_20230103_KJJY' into dev_2nd_LCYH
# Conflicts:
# jero-boot/db/蔚来标准sql/dev_2nd_period.sql
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
# jero-web/src/components/CollectionType/index.vue
# jero-web/src/components/CollectionTypeDisabled/index.vue
# jero-web/src/components/tableCollection/index.vue
# jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
|
2023-03-20 10:26:24 +08:00 |
|
|
高嵩
|
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 |
|
|
高嵩
|
8847f5e544
|
合并分支 'fix_2nd_20230315' 到 'master'
Fix 2nd 20230315
查看合并请求 laws-nio/laws-weilai!296
|
2023-03-19 22:15:18 +08:00 |
|
|
高嵩
|
2ed75c2a5a
|
提交OTA 生成代码
|
2023-03-17 15:45:03 +08:00 |
|
|
高嵩
|
658f1ded2f
|
修改UAT问题 修改代替标准逻辑
|
2023-03-17 15:12:51 +08:00 |
|
|
高嵩
|
e370d479aa
|
修改UAT问题 消息内容格式去掉标准法规
|
2023-03-16 18:04:30 +08:00 |
|
|
高嵩
|
9eb84ced51
|
修改UAT问题 项目状态看板排序和搜索跳转等
|
2023-03-16 17:40:04 +08:00 |
|
|
高嵩
|
516fa722b8
|
对外报告管理 列表拖拽修改
|
2023-03-15 13:40:15 +08:00 |
|
|
高嵩
|
d17ae70ca2
|
问题标签改为分类 新增标签改为新增分类
|
2023-03-15 11:27:08 +08:00 |
|
|
高嵩
|
9de2333653
|
项目库改为版本可编辑，限制两位数字，正序排序
|
2023-03-15 11:13:26 +08:00 |
|
|
高嵩
|
0c3d9f86ad
|
待办中心默认列宽调整
|
2023-03-15 11:04:32 +08:00 |
|
|
高嵩
|
8faba87908
|
待办中心默认列宽调整
|
2023-03-15 10:50:31 +08:00 |
|
|
高嵩
|
452295a08e
|
虚拟清单自定义表头修改
|
2023-03-15 10:39:36 +08:00 |
|
|
高嵩
|
20ea7056d9
|
修复虚拟清单导出文件名带有/问题
|
2023-03-15 10:14:24 +08:00 |
|
|
高嵩
|
c8510aecfc
|
合并分支 'fix_2nd_20230301' 到 'master'
Fix 2nd 20230301
查看合并请求 laws-nio/laws-weilai!295
|
2023-03-09 17:39:06 +08:00 |
|
|
高嵩
|
e929e161dc
|
修改法规/认证任务计划 删除时间问题
|
2023-03-09 17:38:52 +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 |
|
|
高嵩
|
5041fbc37e
|
修改参数导出数量问题
|
2023-02-24 09:18:00 +08:00 |
|
|
高嵩
|
e4f734c3ab
|
修改参数导出数量问题
|
2023-02-24 09:16:49 +08:00 |
|
|
高嵩
|
14b91ada5c
|
修改参数导出数量问题
|
2023-02-24 09:16:11 +08:00 |
|
|
高嵩
|
e475b4e336
|
修改参数模版控件类型
|
2023-02-23 21:09:25 +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 |
|