Merge remote-tracking branch 'origin/master'

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

@@ -44,7 +44,7 @@ public class UserOrderDonDetail {
 	@DbField("od.status")
 	private OrderDon.Status status;
 
-	@DbField("od.pay_time")
+	@DbField("ifnull(od.pay_time,od.created_time)")
 	private Date payTime;
 
 	@DbField("od.created_time")