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

liyong

6 天以前 f5ee8e7afb178179c1d1d078cf42fe33dc7607f9

 src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java

@@ -73,6 +73,9 @@
    @Excel(name = "是否质检", readConverterExp = "0=否,1=是")
    private Boolean isChecked;



    /**
     * 是否生产
     */
    @Excel(name = "是否生产", readConverterExp = "0=否,1=是")
    private Integer isProduction;
}