Merge branch 'release' of https://git.youlane.cn/server/formallProject into release

mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java

@@ -1,5 +1,6 @@
 package com.iformall.service.impl;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -49,13 +50,15 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService {
 
     @Override
     public void addOne(String tenantId, Long couponId, Long coupon_order_id, int channelType, Long channelId) {
+        Date curDate = new Date();
         WxCouponActionLog actionLog = new WxCouponActionLog();
         actionLog.setTenantId(tenantId);
         actionLog.setCouponId(couponId);
         actionLog.setChannelId(channelId);
         actionLog.setCouponOrderId(coupon_order_id);
         actionLog.setChannelType(channelType);
-        actionLog.setCreateTime(new Date());
+        actionLog.setCreateTime(curDate);
+        actionLog.setCreateTimeMd(new SimpleDateFormat("MM/dd").format(curDate));;
         saveOrUpdate(actionLog);
     }