Commit Graph
30 Commits
Author SHA1 Message Date
cuijiaming dd5f754427 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-28 18:08:29 +08:00
cuijiaming fbb33e9d6a Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-28 18:07:47 +08:00
cuijiaming 85aa763ed9 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-28 18:06:58 +08:00
cuijiaming b3c0534d5c 认证清单-导入的验证 2023-03-28 18:05:36 +08:00
cuijiaming 21560c0cf1 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-27 13:45:31 +08:00
cuijiaming d47372e40d bug修改67147和67146 2023-03-27 13:44:30 +08:00
cuijiaming 55bef20ecd Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-23 21:36:41 +08:00
cuijiaming b485ddbb96 项目库-项目库详情-相关人员名单 2023-03-23 20:02:50 +08:00
cuijiaming 79014e5f45 项目库-项目库详情-合规认证计划 2023-03-23 13:48:17 +08:00
cuijiaming 8f2c9b4374 项目库-项目库详情-合规认证计划 2023-03-23 10:58:41 +08:00
cuijiaming 8e2ae69df9 项目库-项目库详情-合规认证计划 2023-03-21 17:36:05 +08:00
cuijiaming 57e56c5518 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-20 16:27:04 +08:00
cuijiaming d42b5f9883 虚拟认证清单-维护清单中的-更新log开发 2023-03-20 16:26:33 +08:00
cuijiaming 8f1bbcf33d 认证虚拟清单导入导出 2023-03-17 15:21:32 +08:00
cuijiaming 6298c37440 项目库-认证清单-导入导出 2023-03-16 16:47:51 +08:00
cuijiaming a7f2017a8e Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
# Conflicts:
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
2023-03-13 11:38:46 +08:00
cuijiaming 13e067941d 项目库-认证清单-模板下载 2023-03-13 11:31:38 +08:00
cuijiaming 368acedc24 虚拟认证清单(订阅) 2023-03-13 09:13:28 +08:00
cuijiaming bc209dcd83 虚拟认证清单(订阅-导入导出不完整) 2023-03-10 17:27:52 +08:00
cuijiaming 5aa5d40738 虚拟认证清单(订阅-导入导出不完整) 2023-03-10 17:22:01 +08:00
cuijiaming eba03ded14 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
# Conflicts:
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
2023-03-10 16:57:20 +08:00
cuijiaming 16e0e5be74 虚拟认证清单(订阅-导入导出不完整) 2023-03-10 16:41:49 +08:00
cuijiaming 507d82c33b Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-09 15:25:45 +08:00
cuijiaming fd1e919840 法规清单(工程接口人和責任人value修改) 2023-03-09 15:25:28 +08:00
cuijiaming d6973fc6d9 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-09 14:28:00 +08:00
cuijiaming e596d1533d 法规清单(工程接口人和責任人value修改) 2023-03-09 14:27:39 +08:00
cuijiaming ffaf6530d9 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-09 11:57:59 +08:00
cuijiaming a401b99378 法规清单(切换用户下拉按钮时,添加上工程接口人和責任人) 2023-03-09 11:56:14 +08:00
cuijiaming 852e6483b4 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-08 13:37:07 +08:00
cuijiaming e7222278ce 法规清单(切换用户下拉按钮时,将法规工程师和认证工程师分开) 2023-03-08 13:35:32 +08:00