Bläddra i källkod

[营销分析][添加][卡营销列表]

release_toaliyun_real
luozukai 7 år sedan
förälder
incheckning
14c2956a28
2 ändrade filer med 1 tillägg och 4 borttagningar
  1. +0
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 0
- 3
mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java Visa fil

@@ -172,9 +172,6 @@ public class WxCouponController extends BaseController {
if(coupon.getSumSubsidy() == null){ if(coupon.getSumSubsidy() == null){
coupon.setSumSubsidy(0); coupon.setSumSubsidy(0);
} }
if(coupon.getSumSubsidy() == null){
coupon.setSumSubsidy(0);
}
} }
return new ResultData(pageInfo); return new ResultData(pageInfo);
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Visa fil

@@ -256,7 +256,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
|| !record.getLease().equals(dbRent.getLease()) || !record.getLease().equals(dbRent.getLease())
|| !record.getType().equals(dbRent.getType()) || !record.getType().equals(dbRent.getType())
|| !record.getPrice().equals(dbRent.getPrice()) || !record.getPrice().equals(dbRent.getPrice())
|| !record.getAdjustRatio().equals(dbRent.getAdjustRatio())
|| !record.getAdjustRatio().replaceAll("\\s*","").equals(dbRent.getAdjustRatio().replaceAll("\\s*",""))
) { ) {
change = true; change = true;
} }


Laddar…
Avbryt
Spara