Merge branch 'master' into xin

xin

5 days ago 982313135d1c239fe3b20e4c5664781f92d40aca

 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;