瀏覽代碼

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

csx 3 年之前
父節點
當前提交
79e6a89f7d
共有 4 個文件被更改,包括 8 次插入6 次删除
  1. 1 1
      conf/app.conf
  2. 1 1
      enums/error_code.go
  3. 1 0
      models/dialysis.go
  4. 5 4
      routers/router.go

+ 1 - 1
conf/app.conf 查看文件

44
 
44
 
45
 
45
 
46
 [prod]
46
 [prod]
47
-org_id = 9919
47
+org_id = 9504
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 - 1
enums/error_code.go 查看文件

8
 	ErrorCodeNotLogin                       = 6002
8
 	ErrorCodeNotLogin                       = 6002
9
 	ErrorCodePermissionDenied               = 6003
9
 	ErrorCodePermissionDenied               = 6003
10
 	ErrorCodeMobileRegistered               = 6004
10
 	ErrorCodeMobileRegistered               = 6004
11
-	ErrorCodePasswordEmpty                  = 6005
11
+	ErrorCodePasswordEmpty                  = 60052503
12
 	ErrorCodeVerificationCodeWrong          = 6006
12
 	ErrorCodeVerificationCodeWrong          = 6006
13
 	ErrorCodeRegisterFail                   = 6007
13
 	ErrorCodeRegisterFail                   = 6007
14
 	ErrorCodeInvalidToken                   = 6008
14
 	ErrorCodeInvalidToken                   = 6008

+ 1 - 0
models/dialysis.go 查看文件

919
 	DepartmentId                            int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
919
 	DepartmentId                            int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
920
 	Mobile                                  string
920
 	Mobile                                  string
921
 	Name                                    string
921
 	Name                                    string
922
+	Department                              string `gorm:"column:department" json:"department" form:"department"`
922
 }
923
 }
923
 
924
 
924
 //func (SgjUserAdminRole) TableName() string {
925
 //func (SgjUserAdminRole) TableName() string {

+ 5 - 4
routers/router.go 查看文件

1
 package routers
1
 package routers
2
 
2
 
3
 import (
3
 import (
4
-	"gdyb/controllers/sg"
4
+	"gdyb/controllers/sz"
5
+
5
 	//"gdyb/controllers/sz"
6
 	//"gdyb/controllers/sz"
6
 	//"gdyb/controllers/sz"
7
 	//"gdyb/controllers/sz"
7
 	//admin_api "XT_New/controllers/admin_api_controllers"
8
 	//admin_api "XT_New/controllers/admin_api_controllers"
20
 		AllowCredentials: true,
21
 		AllowCredentials: true,
21
 	}))
22
 	}))
22
 
23
 
23
-	sg.HisManagerApiRegistRouters()
24
-	sg.GdybRegistRouters()
25
-	//sz.SZHisManagerApiRegistRouters()
24
+	//sg.HisManagerApiRegistRouters()
25
+	//sg.GdybRegistRouters()
26
+	sz.SZHisManagerApiRegistRouters()
26
 
27
 
27
 }
28
 }