chenxudong bb6058be9c Merge branch 'test' into develop ... # Conflicts: # electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ProjectController.java # electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java # electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java # electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java # electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java # electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java # electrmangnetic/src/main/resources/application.properties 解决部分冲突。		2025-02-24 17:07:32 +08:00
electrmangnetic	Merge branch 'test' into develop	2025-02-24 17:07:32 +08:00
electrmangnetic-backup	优化配置文件	2025-02-11 15:32:55 +08:00
electromagnetic-common	上传相关demo	2025-02-24 13:35:28 +08:00
.gitignore	第一次提交。	2024-12-13 15:27:59 +08:00
pom.xml	重置版本号	2025-02-11 15:10:41 +08:00