Merge branch 'master_liushuang' of pengyue/jsh_erp into master

src/main/resources/application.yml

@@ -6,7 +6,6 @@ mybatis-plus:
 #租户对应的角色id
 manage:
   roleId: 10
-
 tenant:
   userNumLimit: 1000000 #租户允许创建的用户数
   tryDayLimit: 3000 #租户允许试用的天数