Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

# Conflicts:
#	klp-admin/src/main/resources/application.yml

klp-wms/src/main/java/com/klp/domain/FileInfo.java

@@ -1,6 +1,5 @@
 package com.klp.domain;
 
-import jdk.jfr.DataAmount;
 import lombok.Data;
 
 /**

klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java

@@ -45,6 +45,10 @@ public class WmsPurchasePlanDetail extends BaseEntity {
      * 单位
      */
     private String unit;
+    /**
+     * 附件
+     */
+    private String annex;
     /**
      * 状态（ 0=新建，1=在途，2=到货，3=待审核，4=采购完成）
      */

klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java

@@ -50,6 +50,11 @@ public class WmsPurchasePlanDetailBo extends BaseEntity {
      */
     private String unit;
 
+    /**
+     * 附件
+     */
+    private String annex;
+
     /**
      * 状态（ 0=新建，1=在途，2=到货，3=待审核，4=采购完成）
      */

klp-wms/src/main/java/com/klp/domain/vo/RecognizeTextVo.java

@@ -0,0 +1,19 @@
+package com.klp.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class RecognizeTextVo {
+
+    /**
+     * 识别后的文本
+     */
+    private String text;
+
+    public RecognizeTextVo() {
+    }
+
+    public RecognizeTextVo(String text) {
+        this.text = text;
+    }
+}

klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java

@@ -56,6 +56,12 @@ public class WmsPurchasePlanDetailVo {
     @ExcelProperty(value = "单位")
     private String unit;
 
+    /**
+     * 附件
+     */
+    @ExcelProperty(value = "附件")
+    private String annex;
+
     /**
      * 状态（ 0=新建，1=在途，2=到货，3=待审核，4=采购完成）
      */

klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java

@@ -80,5 +80,10 @@ public class WmsStockVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 仓库/库区名称
+     */
+    @ExcelProperty(value = "仓库/库区名称")
+    private String warehouseName;
 
 }