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

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

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

@@ -82,4 +82,6 @@ public class WmsTransferOrderItemBo extends BaseEntity {
     // 修改之后的itemType
     private String itemTypeAfter;
 
+    // 重贴标签的备注
+    private String transferRemark;
 }

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

@@ -83,6 +83,18 @@ public class WmsReceivableVo {
     /**
      * 客户名称
      */
-    @ExcelProperty(value = "客户名称")
     private String customerName;
+
+    // 客户编号
+    private String customerCode;
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 订单名称
+     */
+    private String orderName;
 }