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

controllers/sg/his_api_controller.go

@@ -1140,7 +1140,7 @@ func (c *HisApiController) GetSettleList() {
 		return
 	}
 	if res.Infcode != 0 {
-		order.FaPiaoNumber = new_fapiao_number
+		order.FaPiaoNumber = zero
 		order.FaPiaoCode = last_order.FaPiaoCode
 		err := service.UpdateOrder(order)
 		if err != nil {