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

xiangpei

6 天以前 2226679bda25ddf977f12367a9a37fcf4e377249

 framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java

@@ -14,6 +14,8 @@
import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
import cn.lili.modules.goods.entity.enums.GoodsTypeEnum;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xkcoding.http.util.StringUtil;
import io.swagger.annotations.ApiModel;
@@ -87,12 +89,15 @@
    private Double grade;

    @ApiModelProperty(value = "缩略图路径")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String thumbnail;

    @ApiModelProperty(value = "小图路径")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String small;

    @ApiModelProperty(value = "原图路径")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String original;

    @ApiModelProperty(value = "店铺分类id")
@@ -129,6 +134,7 @@
    private String mobileIntro;

    @ApiModelProperty(value = "商品视频")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String goodsVideo;