Merge branch 'master' of http://111.198.10.15:12003/gitbucket/git/smartwell2.0/casic-smartcity
# Conflicts:
#	casic-web/src/main/resources/config/download/apk/$RHWMEDF.yml
commit ed93f131f66d682293455f285bbd80a4802fdea1
2 parents 475ffda + fe5021b
ChaiZhuang authored on 13 Jul 2022
Showing 3 changed files
View
casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/ITenantDeptService.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java