Explorar el Código

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

release_toaliyun_real
lin hace 3 años
padre
commit
0ef4260211
Se han modificado 2 ficheros con 2 adiciones y 2 borrados
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java Ver fichero

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


filterChainDefinitionMap.put("/goodsCategory/syncGet/**", "anon");
// filterChainDefinitionMap.put("/goodsCategory/syncGet/**", "anon");
// filterChainDefinitionMap.put("/wxCoupon/goods/**", "anon"); // filterChainDefinitionMap.put("/wxCoupon/goods/**", "anon");


// //test // //test


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java Ver fichero

@@ -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); 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); int insertList(@Param("addList")List<WxCouponMerchant> addList);
} }

Cargando…
Cancelar
Guardar