Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

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

@@ -1,10 +1,14 @@
package com.oying.modules.pc.store.domain.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class StoreCategoryMerchantUpdateRequest {

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

    private Long parentId;

    private String name;