Merge remote-tracking branch 'origin/master'

internal/model/gamelife.go

@@ -37,7 +37,7 @@ type GameTask struct {
 	CycleStart          int64               `json:"cycle_start"`
 	CycleEnd            int64               `json:"cycle_end"`
 	TargetName          string              `json:"target_name"`
-	TargetTimes         int                 `json:"target_times"`
+	TargetTimes         int64               `json:"target_times"`
 	Status              int                 `json:"status"`
 	UserTimes           int64               `json:"user_times"`
 	GameTaskConfig      GameTaskConfig      `json:"game_task_config"`

internal/model/reward.go

@@ -291,12 +291,13 @@ type GetGoodsDetailsOut struct {
 }
 
 type OperateTaskRewardIn struct {
-	OperatorId   int64
-	OperatorRole string
-	TaskId       string
-	RewardId     int64
-	Type         int   // 1: 任务添加奖励 2: 任务删除奖励
-	StoreId      int64 // 当前操作门店, 当操作为门店或者是商户时
+	OperatorId    int64
+	OperatorRole  string
+	TaskId        string
+	RewardId      int64
+	Type          int   // 1: 任务添加奖励 2: 任务删除奖励
+	StoreId       int64 // 当前操作门店, 当操作为门店或者是商户时
+	NetbarAccount string
 }
 type OperateTaskRewardOut struct {
 	Success bool

internal/model/storeAdmin.go

@@ -14,7 +14,10 @@ type StoreAdminLoginIn struct {
 }
 
 type StoreAdminLoginOut struct {
-	Token string
+	Token         string
+	StoreId       int64
+	StoreName     string
+	NetbarAccount string
 }
 type StoreAdminListIn struct {
 	Page    int