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

jyy

2021-03-12 a5150265e33e493efd96f8c43f3c46088fe92b55

 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;