Merge remote-tracking branch 'origin/release' into release

dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/activity/entity/Activity.java

@@ -60,6 +60,8 @@ public class Activity extends Entity<Activity> {
     @ApiModelProperty("状态")
     private Integer status;
 
+    @ApiModelProperty("是否展示 0 展示 1 不展示")
+    private Integer display;
 
     private transient List<ActivityProduct> activityProductList;
 

dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/product/entity/Product.java

@@ -48,5 +48,8 @@ public class Product extends Entity<Product> {
     @ApiModelProperty("状态（已上架、已下架）")
     private ProductStatusEnum status;
 
+    @ApiModelProperty("是否展示 0 展示 1 不展示")
+    private Integer display;
+
     private transient List<ProductSpec> productSpecList;
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/request/ActivityDto.java

@@ -34,6 +34,9 @@ public class ActivityDto {
     @ApiModelProperty("活动产品集合")
     private List<ActivityProduct> activityProductList;
 
+    @ApiModelProperty("是否展示 0 展示 1 不展示")
+    private Integer display;
+
    public Activity trans2Domain(){
         Activity activity = TypeConvertUtils.convert(this,Activity.class);
         activity.setStatus(ActivityStatusEnum.ENABLE.getValue());

dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/product/user/request/UserCreateProductDto.java

@@ -70,6 +70,9 @@ public class UserCreateProductDto implements Trans2DomainAssembler<Product> {
     @ApiModelProperty("单日使用上限")
     private String dailyUseLimitValue;
 
+    @ApiModelProperty("是否展示 0 展示 1 不展示")
+    private Integer display;
+
     @Override
     public Product trans2Domain() {
         return TypeConvertUtils.convert(this, Product.class);

dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/product/user/request/UserEditProductDto.java

@@ -81,6 +81,9 @@ public class UserEditProductDto implements Trans2DomainAssembler<Product> {
     @ApiModelProperty("单日使用上限")
     private String dailyUseLimitValue;
 
+    @ApiModelProperty("是否展示 0 展示 1 不展示")
+    private Integer display;
+
     @Override
     public Product trans2Domain() {
         Product product = TypeConvertUtils.convert(this, Product.class);