Merge branch 'dev' into 'mp-server-test'

逻辑删除标识

See merge request quanshu/mp-server!1053

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelWithdraw.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qs.mp.common.enums.ChannelWithdrawStatusEnum;
 import java.io.Serializable;
@@ -144,4 +145,9 @@ public class ChannelWithdraw implements Serializable {
   private Date updateTime;
 
 
+  @ApiModelProperty("删除标识")
+  @TableField("is_deleted")
+  @TableLogic
+  private Integer isDeleted;
+
 }