Merge branch 'test_bak' into 'master'

罗元桥

2021-10-12 117e0945d9d7c94915c44e74c136d21a8fb17043

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductCategoryDTO.java

@@ -40,4 +40,7 @@

    @ApiModelProperty(value = "更新人", hidden = true)
    private Long updatedBy;

    @ApiModelProperty(value = "商家id", hidden = true)
    private Long merchantId;
}