Merge branch 'fms_3.1' into debug

controller/census/income_list.go

@@ -578,7 +578,7 @@ func getCensusIncomeChartList(ch chan models.CensusIncomeChartResp, req fms.Inco
 			//fmt.Println("2:", totalMoneySlice[i])
 			//fmt.Println("3:", totalMoneySlice[i]-prevTotalMoneySlice[i])
 			totalMoneySlice[i], _ = strconv.ParseFloat(fmt.Sprintf("%.2f", totalMoneySlice[i]), 64)
-			if prevTotalMoneySlice[i] != 0 && totalMoneySlice[i] != 0 {
+			if prevTotalMoneySlice[i] != 0 {
 				yoy = (totalMoneySlice[i] - prevTotalMoneySlice[i]) / prevTotalMoneySlice[i]
 				yoyStr = fmt.Sprintf("%.4f", yoy)
 
@@ -1019,7 +1019,7 @@ func getPaymentIncomeChartList(ch chan models.CensusIncomeChartResp, req fms.Inc
 			//fmt.Println("2:", totalMoneySlice[i])
 			//fmt.Println("3:", totalMoneySlice[i]-prevTotalMoneySlice[i])
 			totalMoneySlice[i], _ = strconv.ParseFloat(fmt.Sprintf("%.2f", totalMoneySlice[i]), 64)
-			if prevTotalMoneySlice[i] != 0 && totalMoneySlice[i] != 0 {
+			if prevTotalMoneySlice[i] != 0 {
 				yoy = (totalMoneySlice[i] - prevTotalMoneySlice[i]) / prevTotalMoneySlice[i]
 				yoyStr = fmt.Sprintf("%.4f", yoy)