Merge remote-tracking branch 'origin/master'

# Conflicts:
#	internal/model/userTaskReward.go

internal/dao/internal/reward_types.go

@@ -21,24 +21,26 @@ type RewardTypesDao struct {
 
 // RewardTypesColumns defines and stores column names for the table reward_types.
 type RewardTypesColumns struct {
-	Id        string // 奖励类型ID
-	Name      string // 类型名称
-	Code      string // 唯一编码
-	IconUrl   string // 图标链接地址
-	CreatedAt string // 创建时间
-	UpdatedAt string // 更新时间
-	DeletedAt string // 软删除时间
+	Id            string // 奖励类型ID
+	Name          string // 类型名称
+	Code          string // 唯一编码
+	IconUrl       string // 图标链接地址
+	CreatedAt     string // 创建时间
+	UpdatedAt     string // 更新时间
+	DeletedAt     string // 软删除时间
+	TencentTypeId string // 腾讯类型 id
 }
 
 // rewardTypesColumns holds the columns for the table reward_types.
 var rewardTypesColumns = RewardTypesColumns{
-	Id:        "id",
-	Name:      "name",
-	Code:      "code",
-	IconUrl:   "icon_url",
-	CreatedAt: "created_at",
-	UpdatedAt: "updated_at",
-	DeletedAt: "deleted_at",
+	Id:            "id",
+	Name:          "name",
+	Code:          "code",
+	IconUrl:       "icon_url",
+	CreatedAt:     "created_at",
+	UpdatedAt:     "updated_at",
+	DeletedAt:     "deleted_at",
+	TencentTypeId: "tencent_type_id",
 }
 
 // NewRewardTypesDao creates and returns a new DAO object for table data access.