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

huanghongfa

2021-09-27 7ed0f86229aa2c10b75e438cc1597e830ef684d5

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

@@ -31,6 +31,10 @@
     */
    private String name;
    /**
     * 分类所属商家
     */
    private Long merchantId;
    /**
     * 备注
     */
    private String remark;