Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

9 天以前 4e11972ecb0ab80de695319878c18ca504655c00

 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 = "商品规格")