Merge remote-tracking branch 'origin/master'
# Conflicts:
#	casic-server/pom.xml
#	casic-web/src/main/resources/config/application-dev.yml
commit f289632c6ae55cd5007e9795643dbc2af4530e66
2 parents 99843b6 + 47b4c44
xiezhuangz authored on 18 Nov 2022
Showing 19 changed files
View
casic-server/pom.xml
View
casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java 0 → 100644
View
casic-web/src/main/resources/config/application-dev.yml
View
pom.xml