Merge remote-tracking branch 'origin/master'

# Conflicts:
#	internal/dao/internal/store_client_sessions.go
#	internal/dao/store_client_sessions.go
#	internal/model/do/store_client_sessions.go
#	internal/model/entity/store_client_sessions.go

internal/model/netfeeAreaLevel.go

@@ -0,0 +1,29 @@
+package model
+
+type StoreNetfeeAreaLevel struct {
+	Id            int64  `json:"id"              orm:"id"                description:"主键ID"`             // 主键ID
+	StoreId       int64  `json:"storeId"         orm:"store_id"          description:"门店ID"`             // 门店ID
+	RewardId      int64  `json:"rewardId"        orm:"reward_id"         description:"奖励ID（rewards表主键）"` // 奖励ID（rewards表主键）
+	AreaId        int64  `json:"areaId"          orm:"area_id"           description:"区域ID（外部系统）"`       // 区域ID（外部系统）
+	MemberLevelId int64  `json:"memberLevelId"   orm:"member_level_id"   description:"会员等级ID（外部系统）"`     // 会员等级ID（外部系统）
+	PriceData     string `json:"priceData"       orm:"price_data"        description:"7x24价格矩阵"`         // 7x24价格矩阵
+}
+
+type GetNetfeeSettingIn struct {
+	StoreId       int64
+	AreaId        int64
+	MemberLevelId int64
+	RewardId      int64
+}
+
+type SaveNetfeeSettingIn struct {
+	StoreId       int64
+	RewardId      int64
+	AreaId        int64
+	MemberLevelId int64
+	PriceData     string
+	Id            int64
+}
+type SaveNetfeeSettingOut struct {
+	Success bool
+}

internal/model/storeArea.go

@@ -0,0 +1,17 @@
+package model
+
+type StoreArea struct {
+	Id       int64  `json:"id"        orm:"id"         description:"区域ID"`   // 区域ID
+	StoreId  int64  `json:"storeId"   orm:"store_id"   description:"所属门店ID"` // 所属门店ID
+	AreaName string `json:"areaName"  orm:"area_name"  description:"区域名称"`   // 区域名称
+}
+
+type StoreAreaListIn struct {
+	OperatorId   int64
+	OperatorRole string
+	StoreId      int64 `json:"storeId"`
+}
+type StoreAreaListOut struct {
+	List  []StoreArea
+	Total int
+}