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

jyy

2021-01-25 4ade37283f06a39057992828e13058ef804ae606

 zq-erp/src/main/java/com/matrix/system/hive/pojo/StoreInOutRecordVO.java

@@ -84,6 +84,15 @@

    private Long goodsSortId;

    private Long id;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Date getCreateTime() {
        return createTime;