Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

liyong

2026-05-09 67fda7b2dfbfc9e6a8d8b9472499a67906d2bad1

 src/main/java/com/ruoyi/basic/dto/ProductDto.java

@@ -9,5 +9,8 @@
@Data
public class ProductDto extends Product {

    //浪潮用于区分成品和物料
    private String productType;

    private List<ProductModel> productModelList;
}