Merge remote-tracking branch 'origin/master'

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProductionOrderDo.java

@@ -617,6 +617,17 @@ public class ApsProductionOrderDo extends BaseDo implements Serializable {
      */
     private String processstatustext;
 
+
+    /**
+     * 内部客户ID
+     */
+    private String internalcustomerid;
+
+    /**
+     * 内部客户名称
+     */
+    private String internalcustomername;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProductionOrderHistoryDo.java

@@ -13,7 +13,7 @@ import java.util.Date;
 /**
  * 生产订单历史版本
  *
- * @TableName aps_production_order_history_history
+ * @TableName aps_production_order_history
  */
 @TableName(value = "aps_production_order_history")
 @Data
@@ -621,6 +621,17 @@ public class ApsProductionOrderHistoryDo extends BaseDo implements Serializable
      */
     private String processstatustext;
 
+    /**
+     * 内部客户ID
+     */
+    private String internalcustomerid;
+
+    /**
+     * 内部客户名称
+     */
+    private String internalcustomername;
+
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }