Merge remote-tracking branch 'origin/develop' into develop

repari.go

@@ -0,0 +1 @@
+package main

services/pln/implments/CustOrder.Dashborad.impl.go

@@ -1310,10 +1310,13 @@ func (impl *CustOrderServiceImplement) SelectPic1(user *global.User, dayModel *b
 	//})
 	custOrderMap := make(map[string]model.CustOrder)
 	displayHourMap := make(map[int]interface{})
-	displayHourLi := make([]int, 0, 24)
+	displayHourLi := make([]int, 0, 48)
 	displayHourProductMap := make(map[int][]model.HourProductData)
 	for _, packOrder := range usefulPackOrderLi {
 		hour := packOrder.CloseTime.Restore().Hour()
+		if packOrder.CloseTime.Restore().Day() > startTime.Day() {
+			hour += 24
+		}
 		_, exist := displayHourMap[hour]
 		if !exist {
 			displayHourMap[hour] = nil