Merge branch 'feature/20210414_华莱士微商城申请退款_wangshichang' into feature/20210420-华莱士公用分支-张志恒

order-application-service/src/main/java/cn/freemud/constant/ResponseCodeConstant.java

@@ -10,6 +10,7 @@ public class ResponseCodeConstant {
     public final static String RESPONSE_SUCCESS_STR = "100";
 
     public final static String COCO_RESPONSE_COUPON_ERR_STR = "49000";
+    public final static String USER_HAVE_NO_COUPON = "44039";
 
     public final static String RESPONSE_SUCCESS_OK = "ok";
     public final static Integer RESPONSE_SUCCESS_1 = 1;

order-application-service/src/main/java/cn/freemud/entities/vo/EditAfterSalesExpressVo.java

@@ -12,7 +12,6 @@
  */
 package cn.freemud.entities.vo;
 
-import cn.freemud.enums.RefundModeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;