Merge remote-tracking branch 'origin/master'

# Conflicts:
#	internal/dao/internal/store_desktop_settings.go
#	internal/dao/internal/store_roles.go
#	internal/dao/store_desktop_settings.go
#	internal/dao/store_roles.go

internal/model/storeAdmin.go

@@ -16,3 +16,48 @@ type StoreAdminLoginIn struct {
 type StoreAdminLoginOut struct {
 	Token string
 }
+type StoreAdminListIn struct {
+	Page    int
+	Size    int
+	StoreId int64
+}
+type StoreAdmin struct {
+	Id            int64  `json:"id"             orm:"id"              dc:"门店管理员ID"`
+	StoreId       int64  `json:"storeId"        orm:"store_id"        dc:"所属门店ID"`
+	Username      string `json:"username"       orm:"username"        dc:"用户名"`
+	RealName      string `json:"realName"       orm:"real_name"       dc:"真实姓名"`
+	Phone         string `json:"phone"          orm:"phone"           dc:"手机号"`
+	Email         string `json:"email"          orm:"email"           dc:"邮箱"`
+	IsPrimary     bool   `json:"isPrimary"      orm:"is_primary"      dc:"是否为主账号（true=是，false=否）"`
+	Status        int    `json:"status"         orm:"status"          dc:"状态：1=正常，2=禁用"`
+	StoreRoleId   int64  `json:"storeRoleId"    orm:"store_role_id"   dc:"门店角色ID"`
+	StoreRoleName string `json:"storeRoleName"  orm:"store_role_name" dc:"门店角色名称"`
+}
+
+type StoreAdminListOut struct {
+	List  []StoreAdmin
+	Total int
+}
+
+type StoreAdminCreateIn struct {
+	StoreId     int64
+	Username    string
+	Password    string
+	Phone       string
+	StoreRoleId int
+	RealName    string
+}
+type StoreAdminUpdateIn struct {
+	StoreAdminId int64
+	Phone        string
+	StoreRoleId  int
+	RealName     string
+}
+type StoreAdminEditPasswordIn struct {
+	StoreAdminId int64
+	Password     string
+	Password2    string
+}
+type StoreAdminDeleteIn struct {
+	StoreAdminId int64
+}

internal/model/storeDesktopSetting.go

@@ -0,0 +1,34 @@
+package model
+
+import "github.com/gogf/gf/v2/frame/g"
+
+type StoreDesktopSettings struct {
+	g.Meta               `orm:"table:store_desktop_settings"`
+	Id                   int64  `orm:"id" json:"id"`                                           // 主键ID
+	StoreId              int64  `orm:"store_id" json:"store_id"`                               // 门店ID
+	BackgroundUrl        string `orm:"background_url" json:"background_url"`                   // 桌面背景图片URL
+	Resolution           string `orm:"resolution" json:"resolution"`                           // 分辨率，例如1920x1080
+	IsTopWidgetVisible   bool   `orm:"is_top_widget_visible" json:"is_top_widget_visible"`     // 顶部组件是否显示：FALSE=隐藏，TRUE=显示
+	IsRightWidgetVisible bool   `orm:"is_right_widget_visible" json:"is_right_widget_visible"` // 右侧组件是否显示：FALSE=隐藏，TRUE=显示
+}
+
+type StoreGetDesktopSettingIn struct {
+	OperatorId   int64
+	OperatorRole string
+	StoreId      int64
+}
+type StoreGetDesktopSettingOut struct {
+	StoreDesktopSettings
+}
+
+type SaveDesktopSettingIn struct {
+	Id                   int64
+	StoreId              int64
+	BackgroundUrl        string
+	Resolution           string
+	IsTopWidgetVisible   bool
+	IsRightWidgetVisible bool
+}
+type SaveDesktopSettingOut struct {
+	Id int64
+}

internal/model/storeRole.go

@@ -0,0 +1,44 @@
+package model
+
+type StoreRoleCreateIn struct {
+	StoreId int64
+	Name    string
+}
+
+type StoreRoleCreateOut struct {
+	Id int64 `json:"id"`
+}
+
+type StoreRoleUpdateIn struct {
+	Id      int64
+	StoreID int64
+	Name    string
+}
+
+type StoreRoleUpdateOut struct {
+	Success bool `json:"success"`
+}
+
+type StoreRoleDeleteIn struct {
+	Id int64
+}
+
+type StoreRoleDeleteOut struct {
+	Success bool `json:"success"`
+}
+type StoreRoleListIn struct {
+	StoreId int64
+	Page    int
+	Size    int
+}
+
+type StoreRoleListItem struct {
+	Id      int64  `json:"id"`
+	StoreID int64  `json:"storeId"`
+	Name    string `json:"name"`
+}
+
+type StoreRoleListOut struct {
+	Total int                 `json:"total"`
+	List  []StoreRoleListItem `json:"list"`
+}