Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/unis/vis/mapper/InboundMaterialInfoMapper.java
#	src/main/java/com/unis/vis/service/InboundMaterialInfoService.java
#	src/main/java/com/unis/vis/service/impl/InboundMaterialInfoServiceImpl.java
#	src/main/resources/mapper/vis/InboundMaterialInfoMapper.xml

src/main/java/com/unis/vis/controller/VisController.java

@@ -1,9 +1,6 @@
 package com.unis.vis.controller;
 
-import com.unis.vis.model.InboundMaterialInfo;
-import com.unis.vis.model.OutboundMaterialInfo;
-import com.unis.vis.model.SysDept;
-import com.unis.vis.model.SysTreeDict;
+import com.unis.vis.model.*;
 import com.unis.vis.service.InboundMaterialInfoService;
 import com.unis.vis.service.OutboundMaterialInfoService;
 import com.unis.vis.service.SysDeptService;
@@ -93,7 +90,14 @@ public class VisController {
     }
 
 
-
+    /**
+     * 出入库记录
+     * @return
+     */
+    @GetMapping("/entry_exit_records")
+    public List<OutAndInboundRecord> getEnterExitRecords(@RequestParam(value = "type", required = false) Integer type){
+        return inboundMaterialInfoService.getEnterExitRecords(type);
+    }
 
 
 }

src/main/java/com/unis/vis/model/OutAndInboundRecord.java

@@ -0,0 +1,43 @@
+package com.unis.vis.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 出入库记录
+ * @author 阿杰
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OutAndInboundRecord {
+
+    /**
+     * 类型: 1入库 2出库
+     */
+    private Integer type;
+
+    /**
+     * 调用省份：只有出库有
+     */
+    private String shengName;
+
+    /**
+     * 物资名称
+     */
+    private String materialName;
+
+    /**
+     * 数量
+     */
+    private String quantity;
+
+    /**
+     * 规格
+     */
+    private String specs;
+
+    /**
+     * 出入库日期
+     */
+    private String boundTime;
+}