Merge branch 'master' into pjfk
# Conflicts: # pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java # pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
This commit is contained in:
commit
dd983527f3
529 files changed
+22179
-1213
No files matched your search
+1
@@ -1,5 +1,6 @@
|
||||
com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdKsService
|
||||
com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdDoorApiService
|
||||
com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdLbApiService
|
||||
com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdPartyAuthService
|
||||
com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdZyService
|
||||
com.bsd.pjcloud.thirdparty.api.feign.RemoterVisitorService
|
||||
|
||||
Reference in new issue
Block a user