Commit Graph
25 Commits
Author SHA1 Message Date
yanyizhou 4e588e6579 恢复代码 2021-08-19 10:04:09 +08:00
yanyizhou 801eea7e50 标准法规清单-国家/地区清单中的 每个国家或者地区只能建立一次清单,需做限制
还有标准清单的回显
2021-08-18 22:09:12 +08:00
yanyizhou d457a93c13 标准法规清单新增限制 2021-08-18 19:16:52 +08:00
yanyizhou 89a136ee60 国家地区新增限制 2021-08-18 16:55:20 +08:00
yanyizhou abbf9c257f Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-18 16:44:36 +08:00
yanyizhou 9e0aad737c 限制 2021-08-18 13:46:45 +08:00
yanyizhou 79a6ac3b4c commit 2021-08-18 09:22:11 +08:00
yanyizhou 35877cd941 标准法规清单-国家/地区清单中的 每个国家或者地区只能建立一次清单,需做限制 2021-08-17 20:11:35 +08:00
yanyizhou 249f6bd1eb 零部件编号申请模块开发完成 2021-08-12 17:57:33 +08:00
yanyizhou 7051de09cc Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-12 09:57:28 +08:00
yanyizhou 7071cb23c8 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-12 09:40:39 +08:00
yanyizhou 86ca149885 GIT 2021-08-12 09:40:16 +08:00
yanyizhou 10c81b533d Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-10 19:19:45 +08:00
yanyizhou 3f66b95e94 拆分 2021-08-10 19:19:29 +08:00
yanyizhou d9eaa9d7b1 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-10 18:15:49 +08:00
yanyizhou b9c6899e55 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-10 18:15:38 +08:00
yanyizhou 9af7f462f5 Merge remote-tracking branch 'origin/master' into develop_1
# Conflicts:
#	adc-da-main/src/main/resources/application-dev.properties
2021-08-10 17:29:51 +08:00
yanyizhou d43443640c Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-10 16:01:41 +08:00
yanyizhou 7c74df6030 零部件模块 2021-08-10 16:00:57 +08:00
yanyizhou 8bc6f85a56 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-08 10:39:12 +08:00
yanyizhou 4ea16d31c5 岳志航改的bug 2021-08-08 10:17:38 +08:00
yanyizhou 9f4bbd2eb6 修复了车型项目库标准删除不是关联标准id和项目id删除而是直接按照标准id删除标准的bug 2021-08-08 10:17:38 +08:00
yanyizhou f4f5e952f6 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-06 13:44:56 +08:00
yanyizhou a641acfcc5 修复了车型项目库标准删除不是关联标准id和项目id删除而是直接按照标准id删除标准的bug 2021-08-06 13:43:42 +08:00
yanyizhou b7f1016135 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-04 09:58:36 +08:00