Merge remote-tracking branch 'origin/master'

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/coupon/CouponAddRequestDTO.java

 package cn.com.taiji.managew.dto.equity.coupon;
 
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModel;
     @Min(value = 0, message = "剩余个数阈值，不能小于0")
     private Integer thresholdValue;
 
-    /**
-     * 状态
-     * 1:启用
-     * 0:停用
-     */
-    @ApiModelProperty(value = "状态1:启用,0:停用", required = true)
-    @IntegerConstant(values = "0,1", message = "状态错误")
+
+    @ApiModelProperty(value = "状态", required = true)
     @NotNull
-    private Integer status;
+    private EnableStatus status;
 
 
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/coupon/CouponEditRequestDTO.java

 package cn.com.taiji.managew.dto.equity.coupon;
 
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
      * 1:启用
      * 0:停用
      */
-    @ApiModelProperty(value = "状态1:启用,0:停用", required = true)
-    @IntegerConstant(values = "0,1", message = "状态错误")
+    @ApiModelProperty(value = "状态", required = true)
     @NotNull
-    private Integer status;
+    private EnableStatus status;
 }