Go to file
chenxudong 4d145eaaea Merge branch 'dev-jdk17' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into dev-jdk17
# Conflicts:
#	electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileRelation.java
#	electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
解决冲突。
2025-04-17 10:16:50 +08:00
electrmangnetic Merge branch 'dev-jdk17' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into dev-jdk17 2025-04-17 10:16:50 +08:00
electrmangnetic-backup 去掉uuid 2025-04-16 13:43:33 +08:00
electromagnetic-common 合并冲突 2025-04-17 09:47:05 +08:00
.gitignore 第一次提交。 2024-12-13 15:27:59 +08:00
pom.xml 优化编译依赖 2025-04-11 11:09:14 +08:00