Commit Graph
6169 Commits
Author SHA1 Message Date
wangzhijiang 13c4921cd5 67149 法规清单复制问题修改。 2023-03-27 09:59:41 +08:00
高嵩 ed22c26c0a Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-24 17:38:53 +08:00
wangzhijiang 4349c4a8f1 67031 studio撤回,将法规工程师的清单待校核阶段任务撤回。 2023-03-24 17:36:51 +08:00
wangzhijiang b3b2ae4380 67048 修改。 2023-03-24 17:01:10 +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
wangzhijiang 1daf1dcad0 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-24 16:42:41 +08:00
wangzhijiang a94224476f 禅道bug修改。 2023-03-24 16:42:22 +08:00
范强强 c0f40fb36e 认证清单-认证工程师发起工程接口人和责任人为空的数据提示操作失败 2023-03-24 16:23:48 +08:00
范强强 375fda713b 认证清单-发布时校验截止日期 2023-03-24 16:14:35 +08:00
范强强 65aeb3a7d7 认证清单列表添加交付物模板 2023-03-24 16:04:17 +08:00
wangzhijiang ab5172cda0 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-24 15:52:24 +08:00
wangzhijiang 5d32af0a25 67022 引用交付物问题4处理。 2023-03-24 15:52:07 +08:00
范强强 a5f50dfcf0 文档库-多阶段实施-表头错误 2023-03-24 15:31:40 +08:00
wangzhijiang 87fd799fcb update 2023-03-24 15:28:59 +08:00
wangzhijiang 97bfbbcf39 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-24 15:20:03 +08:00
wangzhijiang 11201aa1a6 禅道 66951 问题处理。 2023-03-24 15:19:51 +08:00
范强强 0d4544f85c 市场认证清单-导入,导入成功后没有自动刷新列表 2023-03-24 15:02:59 +08:00
范强强 018b59fd6b 修改市场法规清单的表头 2023-03-24 14:46:28 +08:00
wangzhijiang d057511366 update 2023-03-24 14:38:11 +08:00
wangzhijiang 1567daf2a2 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-24 14:36:54 +08:00
wangzhijiang d80e09640a 66873 文档库编辑问题。 2023-03-24 14:36:40 +08:00
范强强 bf6e7c4f21 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-24 14:13:12 +08:00
范强强 bd8dd3bfed 修改认证清单的必填校验 2023-03-24 14:05:47 +08:00
wangzhijiang f988892474 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-24 13:47:17 +08:00
wangzhijiang 335caf5821 文档库获取模板修改 66859 2023-03-24 13:47:04 +08:00
范强强 24945eadd1 修改认证清单维护调取 2023-03-24 11:46:56 +08:00
wangzhijiang 108b8095e1 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-24 11:39:43 +08:00
wangzhijiang ce4432cd0f 修改禅道 66867 问题。 2023-03-24 11:39:34 +08:00
范强强 e6e0faf9ca 修改认证清单维护展示数据问题 2023-03-24 11:39:33 +08:00
范强强 b0574de10e 修改认证清单维护展示数据问题 2023-03-24 11:36:08 +08:00
wangzhijiang b3230842fd 禅道bug修改。 2023-03-24 11:23:22 +08:00
范强强 d097e13a2a 修改首页流程 2023-03-24 11:07:19 +08:00
范强强 b4b83b8283 添加市场认证清单的调取 2023-03-24 10:34:43 +08:00
wangzhijiang 3ffed9356c Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-24 10:24:24 +08:00
wangzhijiang d8c2987480 获取认证工程师角色权限逻辑修改 2023-03-24 10:24:17 +08:00
范强强 0e948809ad 修改市场清单名称 2023-03-24 10:10:06 +08:00
范强强 90a73a6ddc 对接法规清单表头设置 2023-03-24 10:04:05 +08:00
wangzhijiang ee8540b5b6 认证虚拟清单调取添加接口开发。 2023-03-24 09:58:09 +08:00
范强强 f2a7a8d0f1 认证参数收集-列表-NIO编号显示不美观 2023-03-24 09:08:01 +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
cuijiaming 55bef20ecd Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-23 21:36:41 +08:00
wangzhijiang b4703a5f48 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-23 20:47:32 +08:00
wangzhijiang e4585df8d7 验证符合性流程-定时发消息。法规清单催办开发。 2023-03-23 20:47:20 +08:00
cuijiaming b485ddbb96 项目库-项目库详情-相关人员名单 2023-03-23 20:02:50 +08:00
范强强 67320ac029 认证参数收集-列表-NIO编号显示不美观 2023-03-23 17:08:09 +08:00
范强强 4d812ed8f4 修改催办传参 2023-03-23 17:01:31 +08:00
zyx.net 1749218f44 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-23 16:39:41 +08:00