Merge branch 'master' into xin

xin

5 days ago 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179

 oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCategoryUpdateRequest.java

@@ -5,11 +5,11 @@
@Data
public class StoreCategoryUpdateRequest {

    private Long categoryId;

    private Long storeId;

    private Long parentId;

    private Long categoryId;

    private String name;