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

conf/app.conf

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

enums/error_code.go

@@ -8,7 +8,7 @@ const ( // ErrorCode
 	ErrorCodeNotLogin                       = 6002
 	ErrorCodePermissionDenied               = 6003
 	ErrorCodeMobileRegistered               = 6004
-	ErrorCodePasswordEmpty                  = 6005
+	ErrorCodePasswordEmpty                  = 60052503
 	ErrorCodeVerificationCodeWrong          = 6006
 	ErrorCodeRegisterFail                   = 6007
 	ErrorCodeInvalidToken                   = 6008

models/dialysis.go

@@ -919,6 +919,7 @@ type SgjUserAdminRole struct {
 	DepartmentId                            int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
 	Mobile                                  string
 	Name                                    string
+	Department                              string `gorm:"column:department" json:"department" form:"department"`
 }
 
 //func (SgjUserAdminRole) TableName() string {

routers/router.go

@@ -1,7 +1,8 @@
 package routers
 
 import (
-	"gdyb/controllers/sg"
+	"gdyb/controllers/sz"
+
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"
@@ -20,8 +21,8 @@ func init() {
 		AllowCredentials: true,
 	}))
 
-	sg.HisManagerApiRegistRouters()
-	sg.GdybRegistRouters()
-	//sz.SZHisManagerApiRegistRouters()
+	//sg.HisManagerApiRegistRouters()
+	//sg.GdybRegistRouters()
+	sz.SZHisManagerApiRegistRouters()
 
 }