Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2022-12-06 2a212f983f35e1c569dfec3a172fb5f0c9f85fac

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

@@ -49,6 +49,7 @@
    /**
     * 商品展示图
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String images;

    /**
@@ -106,7 +107,7 @@
    /**
     * 配送方式（1.自提 2.快递）
     */
    private Integer deliveryType;
    private String deliveryType;

    /**
     * 删除状态（1.未删除 2.已删除）