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

liyong

6 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

 src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java

@@ -29,6 +29,12 @@
    @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date inboundDate;

    /**
     * 编号
     */
    @Excel(name = "编号")
    private String code;

    @TableField(exist = false)
    private String timeStr;