Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -1073,7 +1073,7 @@ func (c *HisApiController) GetBatchSettleList() {
 
 		for _, item := range rf {
 			if item.FundPayType == "610100" {
-				tempFunPay610100.FundPayamt = tempFunPay610100.FundPayamt + item.FundPayamt
+				tempFunPay610100.FundPayamt, _ = decimal.NewFromFloat(tempFunPay610100.FundPayamt).Add(decimal.NewFromFloat(item.FundPayamt)).Float64()
 				tempFunPay610100.FundPayType = item.FundPayType
 			} else {
 				var tempFunPay service.CustomStruct