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

manailin

2021-10-08 84fae9aed66f2841b58b2ef66ff7c11cd0dbaacd

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

@@ -35,10 +35,18 @@
     */
    private Long categoryId;
    /**
     * 产品所属商家
     */
    private Long merchantId;
    /**
     * 是否上架
     */
    private Boolean onShelf;
    /**
     * 上架时间
     */
    private Date onShelfAt;
    /**
     * 产品介绍
     */
    private String introduction;