Merge branch '230516_yeepay' into master_saas

# Conflicts:
#	mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -43,7 +43,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                         "/tenantInfo/info/*", "/tenantInfo/checkInfo/*", "/tenantInfo/pay/*","/tenantInfo/testCheck", "/tenantInfo/getContract/*",
                         "/tenantPreJoin/add","/imLiveBroadcastRoom/queryRoomInfo","/imLiveBroadcastRoom/test",
                         "/eduOrganization/queryAllOrgan","/eduOrganization/queryAll","/eduOrganization/getOrganCooperation","/import/oaUploadFile",
-                        "/tenantInfo/callback", "/open/**","/schoolActivity/detail/*","/adapay/callback","/temp/*","/yeepay/callback/**"
+                        "/tenantInfo/callback/**", "/open/**","/schoolActivity/detail/*","/adapay/callback","/temp/*","/yeepay/callback/**"
                 )
                 .permitAll().anyRequest().authenticated().and().httpBasic();
     }