Merge branch 'new_2.6' into debug

controller/census/invoice_payment.go

@@ -1949,7 +1949,11 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 				} else if v.InvoicedAmountCount == 0 {
 					invoiceTotal += v.PaymentAmountCount
 				}
-				contractAmount += v.ContractAmount
+				rate := v.RMBRate
+				if rate == 0.0{
+					rate = 1.0
+				}
+				contractAmount += v.ContractAmount/v.RMBRate
 			}
 
 		}()