Merge remote-tracking branch 'origin/master' into xin

xin

2025-06-24 9a66c01477b81f8d429a45b0a2922ab75e2e9c64

 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;