diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
index a092035c5..f13d630d6 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
@@ -1,32 +1,21 @@
package com.iformall.controller;
-import com.alibaba.fastjson.JSON;
-import com.github.pagehelper.PageInfo;
-import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxCoupon;
-import com.iformall.domain.po.WxCouponChannel;
-import com.iformall.domain.po.WxMerchant;
import com.iformall.enums.*;
-import com.iformall.service.WxCouponChannelService;
import com.iformall.service.WxCouponService;
-import com.iformall.service.WxMerchantService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.map.HashedMap;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import java.text.DateFormatSymbols;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.stream.Collectors;
@RestController
@RequestMapping("wxCoupon")
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
index 502db82e7..e48b2fa15 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
@@ -66,8 +66,8 @@ public class WxCoupon implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date enddate;
- @Transient
- private String xTime;
+ @Transient
+ private String xtime;
/**租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
@@ -562,13 +562,11 @@ public class WxCoupon implements Serializable {
}
}
- public String getxTime() {
- return xTime;
+ public String getXtime() {
+ return xtime;
}
- public void setxTime(String xTime) {
- this.xTime = xTime;
+ public void setXtime(String xtime) {
+ this.xtime = xtime;
}
-
-
}
diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java
index 409a11c46..36a935b4f 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java
@@ -4,7 +4,6 @@ import java.util.*;
import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxCoupon;
-import com.iformall.domain.po.WxCouponChannel;
import com.iformall.domain.vo.WxCouponCVo;
public interface WxCouponService {
diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index b839f6d99..4c0a8ea93 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -679,23 +679,23 @@