Merge branch 'fms_3.1' into debug

controller/census/income_list.go

@@ -1441,7 +1441,7 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 						amountCond += `OR ( d.seller_id IN ? AND  a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?)) `
 						amountPars = append(amountPars, sellerIds, st, ed, sellerIds, st, ed)
 					} else {
-						amountCond += ` AND ((a.invoice_id <> 0 AND d.invoice_time BETWEEN ? AND ?)`
+						amountCond += ` AND ((a.invoice_id <> 0 AND b.invoice_time BETWEEN ? AND ?)`
 						amountCond += `OR (a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?))`
 						amountPars = append(amountPars, st, ed, st, ed)
 					}