Merge branch 'service_types' into debug

controller/census/invoice_payment.go

@@ -860,13 +860,13 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 		}
 		// 勾选套餐筛选时忽略导入的历史数据
 		if req.StartDate == "" {
-			startDateTime,_ := time.Parse(utils.FormatDate, req.StartDate)
+			req.StartDate = "2023-04"
+			req.EndDate = "3023-04"
+		} else {
+			startDateTime,_ := time.Parse(utils.FormatMonth, req.StartDate)
 			if startDateTime.Before(historyTime) {
 				req.StartDate = "2023-04"
 			}
-			req.EndDate = "3023-04"
-		} else {
-			req.StartDate = "2023-04"
 		}
 	}