Merge branch 'fms_3.1' into debug

controller/census/income_list.go

@@ -849,7 +849,7 @@ func getPaymentIncomeChartList(ch chan models.CensusIncomeChartResp, req fms.Inc
 				cond += ` AND a.register_id IN ?`
 				prevCond += ` AND a.register_id IN ?`
 				pars = append(pars, registerIds)
-				prevPars = append(pars, registerIds)
+				prevPars = append(prevPars, registerIds)
 			} else {
 				cond += ` AND 1 = 2`
 				prevCond += ` AND 1 = 2`