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

zss

8 天以前 019c945c19ef6941adaea1f6d2f5e59649308892

 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;
}