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

maven

8 天以前 539624ef39177ebb6fd5577b83df7097dd6f4bec

 src/main/java/com/ruoyi/production/pojo/ProductOrder.java

@@ -31,6 +31,12 @@
     * 销售台账产品id(sales_ledger_product)
     */
    @ApiModelProperty(value = "销售台账产品id")
    private Long saleLedgerProductId;

    /**
     * 产品规格id
     */
    @ApiModelProperty(value = "产品规格id")
    private Long productModelId;

    /**