Merge branch 'master' of http://git.yn-ce.com/git/fujun/dxCard-service
# Conflicts:
#	jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardApplicationCustomersController.java
#	jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardDeliveryPersonController.java
#	jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/entity/CardApplicationCustomers.java
commit 050ca2e8e090ac7b81ef7a924d9369f2d04c9dc8
2 parents 53ddb4f + b942814
jiangqihao authored on 26 Sep
Showing 6 changed files
View
jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardApplicationCustomersController.java
View
jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardDeliveryPersonController.java
View
jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/dto/CardApplicationCustomersUpdateDTO.java 0 → 100644
View
jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/entity/CardApplicationCustomers.java
View
jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/vo/AreaCardDeliveryPersonVO.java 0 → 100644
View
jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/vo/CardApplicationCustomersVO.java 0 → 100644