Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

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

@@ -23,6 +23,9 @@
    @ApiModelProperty(value = "店铺简称", example = "永辉超市(新纪元店)")
    private String storeShortName;*/

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

    @NotNull
    @ApiModelProperty(value = "店铺LOGO文件ID", example = "14567785444763247876234")
    private Long logoUploadFileId;