Merge branch 'test_bak' into 'master'

罗元桥

2021-09-27 a5ebb9545a1fdc78f6c1c285ce4f6c7a37b9e749

 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;