Merge branch 'release_toaliyun_real_20230228' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230228

mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java

@@ -150,7 +150,7 @@ public class ShiroConfig {
 //        filterChainDefinitionMap.put("/wxProjectConfig/**", "anon");
 //        filterChainDefinitionMap.put("/goodsCategory/**", "anon");
 
-        filterChainDefinitionMap.put("/goodsCategory/syncGet/**", "anon");
+//        filterChainDefinitionMap.put("/goodsCategory/syncGet/**", "anon");
 //        filterChainDefinitionMap.put("/wxCoupon/goods/**", "anon");
 
 //        //test

mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java

@@ -28,6 +28,6 @@ public interface WxCouponMerchantMapper extends CommonMapper<WxCouponMerchant, L
 
 	int updateStatus(@Param("tenantId")String tenantId, @Param("productId")Long couponId, @Param("merchantIdList")List<Long> merchantIds,@Param("status")Integer status);
 
-	//自动加tenent
+	//自动加tenant
 	int insertList(@Param("addList")List<WxCouponMerchant> addList);
 }