Bläddra i källkod

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

csx 3 år sedan
förälder
incheckning
c8da83ffca

+ 1 - 1
conf/app.conf Visa fil

44
 
44
 
45
 
45
 
46
 [prod]
46
 [prod]
47
-org_id = 9504
47
+org_id = 10106
48
 mobile_token_expiration_second = 86400
48
 mobile_token_expiration_second = 86400
49
 httpdomain = https://api.xt.kuyicloud.com
49
 httpdomain = https://api.xt.kuyicloud.com
50
 sso_domain = https://sso.kuyicloud.com
50
 sso_domain = https://sso.kuyicloud.com

+ 1 - 0
controllers/sg/his_api_controller.go Visa fil

2541
 				SettleEndTime:       end_time,
2541
 				SettleEndTime:       end_time,
2542
 				Creator:             roles.ID,
2542
 				Creator:             roles.ID,
2543
 				Modify:              roles.ID,
2543
 				Modify:              roles.ID,
2544
+				PType:               2,
2544
 			}
2545
 			}
2545
 			err = service.CreateOrder(order)
2546
 			err = service.CreateOrder(order)
2546
 			if err != nil {
2547
 			if err != nil {

+ 1 - 0
controllers/sz/sz_his_api_controller.go Visa fil

2443
 			Modify:              admin_user_id,
2443
 			Modify:              admin_user_id,
2444
 			OrgSetlNumber:       number,
2444
 			OrgSetlNumber:       number,
2445
 			MdtrtId:             mz_number,
2445
 			MdtrtId:             mz_number,
2446
+			PType:               2,
2446
 		}
2447
 		}
2447
 		data, _ := json.Marshal(ress)
2448
 		data, _ := json.Marshal(ress)
2448
 		order.DetailLog = string(data)
2449
 		order.DetailLog = string(data)