Merge branch 'master' into xin

xin

6 days ago 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179

 oying-system/src/main/java/com/oying/modules/pc/category/domain/dto/PlatformCategoryUpdateRequest.java

@@ -9,6 +9,9 @@
@Data
public class PlatformCategoryUpdateRequest {

    @ApiModelProperty(value = "类目ID")
    private Long categoryId;

    @ApiModelProperty(value = "类目名称", example = "超市")
    private String name;