Merge branch 'dev_New_pro' into dev_pro_山西长治

gongchunyi

2026-07-06 76dc7e5445218129cbdce8feef1eea4a82b3069b

 src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java

@@ -17,6 +17,9 @@
    @Schema(description = "产品Id")
    @TableField(value = "product_id")
    private Long productId;
    @Schema(description = "产品规格Id")
    @TableField(value = "product_model_id")
    private Long productModelId;
    @Schema(description = "商品名称")
    private String product;
    @Schema(description = "商品规格")