Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

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

@@ -26,9 +26,6 @@
    @ApiModelProperty(value = "店铺ID")
    private Long storeId;

    @ApiModelProperty(value = "商户ID")
    private Long merchantId;

    @ApiModelProperty(value = "平台类目")
    private Long platformCategoryId;