Merge remote-tracking branch 'origin/div' into div

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java

@@ -2036,11 +2036,7 @@
      userCouponVO.setCouponTerm(couponTerm);

      

      Map<String, Object> remainDays = new HashMap<String, Object>();

		
      try {

         remainDays.put("content", "剩余" + DateUtil.dateDiff2(new Date(), record.getGiveTime()) + "过期");

      } catch (Exception e) {

      }

      remainDays.put("content", "剩余23时59分过期");

      remainDays.put("fontColor", "#F14242");

      userCouponVO.setRemainDays(remainDays);