Merge branch 'master' into pre

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

@@ -47,7 +47,7 @@ public class OrderDonUserRefundDetailView {
 		@DbField("o.sku_id")
 		private Long skuId;
 
-		@DbField("ifnull(o.payTime,o.created_time)")
+		@DbField("ifnull(o.pay_time,o.created_time)")
 		private Date payTime;
 
 		@DbField("o.status")