Merge branch 'fms_3.1' into debug

controller/census/income_list.go

@@ -1610,7 +1610,12 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 				}
 				resultList = append(resultList, results...)
 			}
-			sort.Sort(resultList)
+
+			if req.SortType == "desc" {
+				sort.Sort(sort.Reverse(resultList))
+			} else {
+				sort.Sort(resultList)
+			}
 
 			// 货币列表
 			currencyOB := new(fms.CurrencyUnit)