Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-17 f721ee13dc5f95f607bb25b09f73cae6a7123ed9

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java

@@ -126,6 +126,31 @@
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
     * 商品状态(1.出售中  2.已下架  3.回收站)
     */
    public interface status{
        int sell = 1;
        int lower = 2;
        int recovery = 3;
    }

    /**
     * 删除状态（1.未删除  2.已删除）
     */
    public interface deleteStatus{
        int no = 1;
        int yes = 2;
    }

    /**
     * 配送方式（1.商家配送  2.快递物流）
     */
    public interface deliveryType{
        int store = 1;
        int express = 2;
    }

    @Override
    public String toString() {
        return "ComShopGoodsDO{" +