Merge branch 'dev' into pre-production

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/vo/OpFactoryPackageDataVO.java

@@ -41,6 +41,15 @@ public class OpFactoryPackageDataVO implements Serializable {
 	 */
 	private String pushStatus;
 
+	/**
+	 *  业务员模式
+	 *
+	 *  经销商
+	 *
+	 *  干仓配 不进行数据回传
+	 */
+	private String businessModel;
+
 
 
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryPackageMapper.xml

@@ -22,7 +22,8 @@
         ofp.first_class_name,
         ofp.second_class_name,
         ofp.third_class_name,
-        ofp.push_status
+        ofp.push_status,
+        ofo.business_model
         FROM
         op_factory_package ofp
         LEFT JOIN op_factory_order ofo ON ofo.id = ofp.order_id