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

conf/app.conf

@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9504
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -2541,6 +2541,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 				SettleEndTime:       end_time,
 				Creator:             roles.ID,
 				Modify:              roles.ID,
+				PType:               2,
 			}
 			err = service.CreateOrder(order)
 			if err != nil {

controllers/sz/sz_his_api_controller.go

@@ -2443,6 +2443,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 			Modify:              admin_user_id,
 			OrgSetlNumber:       number,
 			MdtrtId:             mz_number,
+			PType:               2,
 		}
 		data, _ := json.Marshal(ress)
 		order.DetailLog = string(data)