合并冲突

src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -1,15 +1,18 @@
 package casbin
 
 import (
-	"dashoo.cn/backend/api/business/accountinfo"
-	"dashoo.cn/backend/api/business/company"
-	"dashoo.cn/backend/api/business/printscheme"
 	"encoding/json"
+	"fmt"
 	"strings"
 
+	"dashoo.cn/backend/api/business/accountinfo"
+	"dashoo.cn/backend/api/business/company"
+	"dashoo.cn/backend/api/business/logsinfo"
 	"dashoo.cn/backend/api/business/organize"
+	"dashoo.cn/backend/api/business/printscheme"
 	"dashoo.cn/backend/api/business/role"
 	"dashoo.cn/backend/api/models"
+	"dashoo.cn/business2/auth"
 	"dashoo.cn/business2/permission"
 	"dashoo.cn/business2/userRole"
 
@@ -48,6 +51,8 @@ type UserModel struct {
 type UserModuleModel struct {
 	A1list string `json:"a1"` // 第一级菜单
 	A2list string `json:"a2"` // 第二级菜单
+}
+
 type ChangePwdModel struct {
 	Pwd    string `json:"pass"`
 	NwePwd string `json:"newpass"`
@@ -438,6 +443,8 @@ type AccountTjModel struct {
 	RKlist      []samplesapply.SamplesApply
 	CKTotal     int64
 	CKlist      []samplesapply.SamplesApply
+}
+
 // @Title 修改密码
 // @Description 修改密码
 // @Param	body	body	business.device.DeviceChannels	"传感器信息"
@@ -457,6 +464,7 @@ func (this *UserController) UserChangePWD() {
 		idint, _ := utils.StrTo(this.User.Id).Int()
 		var umodel userRole.Base_User = userRole.Base_User{Id: idint}
 		svcauth.UpdateLog(this.User.Id, &entitypaw1, &entitypaw2, this.User.Id, this.User.Realname)
+
 		err := svcauth.SetNewPassword3DES(&umodel, model.NwePwd)
 		if err != nil {
 			errinfo.Message = "修改失败！" + err.Error()
@@ -557,6 +565,8 @@ func (this *UserController) GetTotalByGroupbydevice() {
 
 	this.Data["json"] = svc.GetTJBydevice(this.User.AccCode, where)
 	this.ServeJSON()
+}
+
 // @Title 注册管理账号
 // @Description 注册管理账号
 // @Param	body	body	business.device.DeviceChannels	"传感器信息"

src/dashoo.cn/backend/api/routers/router.go

@@ -394,6 +394,7 @@ func init() {
 				&controllers.UploadController{},
 			),
 		),
+		beego.NSNamespace("/workflow",
 			beego.NSInclude(
 				&workflow.WorkflowController{},
 			),