Merge branch 'mj' into dev

netflix-dao/src/main/java/com/cyksj/model/manage/views/UpgradeOrderDonSearchView.java

@@ -3,6 +3,7 @@ package com.cyksj.model.manage.views;
 import com.cyksj.model.entity.GoodsDon;
 import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.entity.OrderDonWaybill;
+import com.cyksj.model.entity.UpgradeOrderDon;
 import com.cyksj.model.views.GoodsDonSkuView;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
@@ -45,11 +46,23 @@ public class UpgradeOrderDonSearchView {
 	@DbField("gs.spec_val")
 	private String specVal;
 
+	@DbField("o.money")
+	private BigDecimal money;
+
+	@DbField("o.balance")
+	private BigDecimal balance;
+
+	@DbField("o.refund_money")
+	private BigDecimal refundMoney;
+
+	@DbField("o.refund_balance")
+	private BigDecimal refundBalance;
+
 	@DbField("o.status")
-	private OrderDon.Status status;
+	private UpgradeOrderDon.Status status;
 
 	@DbField("o.type")
-	private OrderDon.Type type;
+	private UpgradeOrderDon.Type type;
 
 	@DbField("o.created_time")
 	private Date createdTime;