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

gongchunyi

12 小时以前 dfa9258c8879dbb0d1bfc00d7f939031d0bb623b

 src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java

@@ -70,4 +70,10 @@
    @ApiModelProperty(value = "结束时间")
    private String entryDateEnd;


    private BigDecimal outputNum;

    private BigDecimal outputRate;


}