Merge branches 'developer' and 'developerB' of git.caimei365.com:chao/caimei-modules-soa into developerB

base-module/src/main/java/com/caimei/module/base/entity/po/CmLogisticsBatch.java

@@ -61,5 +61,15 @@ public class CmLogisticsBatch implements Serializable {
      */
     private Date receiptTime;
 
+    /**
+     * 备注图片,以"||"隔开
+     */
+    private String remarkImage;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
     private static final long serialVersionUID = 1L;
 }

base-module/src/main/java/com/caimei/module/base/entity/po/CmOrder.java

@@ -264,5 +264,10 @@ public class CmOrder implements Serializable {
      */
     private String postageOrderFlag;
 
+    /**
+     * 第三方订单编号(绑定第三方订单关系),适用第三方发起订单
+     */
+    private String thirdPartyOrderNo;
+
     private static final long serialVersionUID = 1L;
 }

base-module/src/main/java/com/caimei/module/base/entity/vo/LogisticsInfoThirdPartyVo.java

@@ -0,0 +1,22 @@
+package com.caimei.module.base.entity.vo;
+
+import lombok.Data;
+
+/**
+ * Description
+ * 第三方接口物流信息
+ * @author : Lijun
+ * @date : 2020\6\9
+ */
+@Data
+public class LogisticsInfoThirdPartyVo  {
+    /***
+     * 物流公司名称
+     */
+    private String express_company;
+
+    /***
+     * 物流公司单号
+     */
+    private String express_no;
+}