Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue

@@ -260,11 +260,11 @@ export default {
                         i.remark = i.field
                         i.questionType = formType(i.type)
                         i.require = formatNum(i.$required)
-                        i.content = i.info || ''
+                        i.content = i.title
                         if (formType(i.type) == 1 || formType(i.type) == 2) {
                             i.options.forEach(j => {
-                                j.content = j.value
-                                j.remark = j.label
+                                j.content = j.label
+                                j.remark = j.value
                             })
                         }
                         if (formType(i.type) == 1 || formType(i.type) == 2) {