Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	pkg/infrastructure/pg/models/evaluation_project.go

@@ -12,16 +12,16 @@ type StaffAssess struct {
 	Id                    int                      `pg:",pk"`          //id
 	Id                    int                      `pg:",pk"`          //id
 	CompanyId             int                      `comment:"公司id"`    //公司id
 	CompanyId             int                      `comment:"公司id"`    //公司id
 	EvaluationProjectId   int                      `comment:"对应的项目id"` //对应的项目id
 	EvaluationProjectId   int                      `comment:"对应的项目id"` //对应的项目id
-	EvaluationProjectName string
+	EvaluationProjectName string                   `comment:"对应的项目名称"`
 	CycleId               int64                    `comment:"对应的周期id"` //对应的周期id
 	CycleId               int64                    `comment:"对应的周期id"` //对应的周期id
-	CycleName             string
-	StaffAssessTaskId     int
+	CycleName             string                   `comment:"对应的周期名称"`
+	StaffAssessTaskId     int                      `comment:"评估任务的id"`
 	TargetUser            domain.StaffDesc         `comment:"被评估的目标用户"`    //被评估的目标用户
 	TargetUser            domain.StaffDesc         `comment:"被评估的目标用户"`    //被评估的目标用户
 	TargetDepartment      []domain.StaffDepartment `comment:"被评估的用户所在的部门"` //被评估的用户所在的部门
 	TargetDepartment      []domain.StaffDepartment `comment:"被评估的用户所在的部门"` //被评估的用户所在的部门
 	Executor              domain.StaffDesc         `comment:"填写评估的用户"`     //填写评估的用户
 	Executor              domain.StaffDesc         `comment:"填写评估的用户"`     //填写评估的用户
 	Types                 string                   `comment:"填写评估对应的类型"`   //填写评估对应的类型
 	Types                 string                   `comment:"填写评估对应的类型"`   //填写评估对应的类型
 	LinkNodeId            int                      `comment:"评估环节id"`
 	LinkNodeId            int                      `comment:"评估环节id"`
-	LinkNodeName          string
+	LinkNodeName          string                   `comment:"评估环节名称"`
 	Status                string                   `comment:"评估的填写状态"` //评估的填写状态
 	Status                string                   `comment:"评估的填写状态"` //评估的填写状态
 	BeginTime             time.Time                `comment:"开始时间"`    //开始时间
 	BeginTime             time.Time                `comment:"开始时间"`    //开始时间
 	EndTime               time.Time                `comment:"截止时间"`    //截止时间
 	EndTime               time.Time                `comment:"截止时间"`    //截止时间

@@ -20,7 +20,7 @@ type StaffAssessContent struct {
 	ReteResult    string   //评估的结果
 	ReteResult    string   //评估的结果
 	Rule          domain.EvaluationRule
 	Rule          domain.EvaluationRule
 	Remark        []domain.AssessContemtRemark
 	Remark        []domain.AssessContemtRemark
-	Weight        int       //权重
+	Weight        int       `pg:",use_zero"` //权重
 	CreatedAt     time.Time //数据创建时间
 	CreatedAt     time.Time //数据创建时间
 	UpdatedAt     time.Time //数据更新时间
 	UpdatedAt     time.Time //数据更新时间
 	DeletedAt     *time.Time
 	DeletedAt     *time.Time