merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopDivideOrderVo.java

@@ -97,4 +97,7 @@ public class TopDivideOrderVo {
 	private BigDecimal brokerage;
 	@ApiModelProperty("角色名称")
 	private String roleName;
+
+	@ApiModelProperty("订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单 ")
+	private Integer orderFrom;
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideOrderMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             oo.divide_company_money,
             oo.divide_seller_money,
             oo.brokerage,
+            oo.order_from,
             r.role_name
         FROM
             top_divide_order tdo