electromagnetic-data-new/electrmangnetic
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
..
src 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
pom.xml 解决repackage报红的问题 2025-04-11 12:09:09 +08:00