mirror of https://gitee.com/stylefeng/roses
Merge branch 'master' into 7.0.4-develop
# Conflicts: # kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.javapull/22/head
commit
934c2b47c1