Merge branch 'dev-tangxvhui' into test

 package adapter
 package adapter
 
 
 type ListUserAssessContent struct {
 type ListUserAssessContent struct {
-	TableHeader []ListTableHeader   `json:"tableHeader"`
-	List        []map[string]string `json:"list"`
-	Total       int                 `json:"total"`
+	TableHeader []ListTableHeader        `json:"tableHeader"`
+	List        []map[string]interface{} `json:"list"`
+	Total       int                      `json:"total"`
 }
 }

@@ -163,11 +163,11 @@ func (srv StaffAssessServeice) ListUserAssessContentCycleDay(param *query.ListAs
 	//过滤重复的列
 	//过滤重复的列
 	headerMap := map[string]string{}
 	headerMap := map[string]string{}
 	// 获取已经填报的内容
 	// 获取已经填报的内容
-	changeableRows := map[string]map[string]string{}
+	changeableRows := map[string]map[string]interface{}{}
 	tableSort := []string{} //确定列表行数据的顺序
 	tableSort := []string{} //确定列表行数据的顺序
 	for i, v := range contentList {
 	for i, v := range contentList {
 		if _, ok := changeableRows[v.TargetUserId]; !ok {
 		if _, ok := changeableRows[v.TargetUserId]; !ok {
-			changeableRows[v.TargetUserId] = map[string]string{}
+			changeableRows[v.TargetUserId] = map[string]interface{}{}
 			tableSort = append(tableSort, v.TargetUserId)
 			tableSort = append(tableSort, v.TargetUserId)
 		}
 		}
 		changeableRows[v.TargetUserId]["targetUserName"] = v.TargetUserName
 		changeableRows[v.TargetUserId]["targetUserName"] = v.TargetUserName
@@ -186,7 +186,7 @@ func (srv StaffAssessServeice) ListUserAssessContentCycleDay(param *query.ListAs
 			changeableRows[v.TargetUserId][key] = v.Value
 			changeableRows[v.TargetUserId][key] = v.Value
 		}
 		}
 	}
 	}
-	list := []map[string]string{}
+	list := []map[string]interface{}{}
 	for _, v := range tableSort {
 	for _, v := range tableSort {
 		for _, v2 := range changeableHeader {
 		for _, v2 := range changeableHeader {
 			if _, ok := changeableRows[v][v2.Key]; ok {
 			if _, ok := changeableRows[v][v2.Key]; ok {