Merge branch 'exchangerate' into abroad_dev

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

@@ -94,7 +94,7 @@ public class OrderDonBackView {
 	private BigDecimal money;
 
 	@DbField("o.currency")
-	private BigDecimal currency;
+	private String currency;
 
 	@DbField("o.balance")
 	private BigDecimal balance;