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

liyong

7 天以前 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2

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

@@ -140,5 +140,9 @@

    @ApiModelProperty(value = "付款方式")
    private String paymentMethod;

    @TableField(exist = false)
    @ApiModelProperty(value = "生产状态")
    private String productionStatus = "未开始";
}