Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

 oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductMerchantCreateRequest.java

@@ -10,7 +10,7 @@
import java.util.List;

@Data
public class ProductMerchantCreateRequest {
public class ProductMerchantCreateRequest implements ProductCreateRequest {

    private Long storeId;