Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature-xiaowang

# Conflicts:
#	src/views/modules/volunteer/Dynamicmanagement/add.vue
#	src/views/modules/volunteer/Dynamicmanagement/edit.vue
#	src/views/modules/volunteer/Dynamicmanagement/index.vue
#	src/views/modules/volunteer/Dynamicmanagement/info.vue
#	src/views/modules/volunteer/LifeCircleManagement/index.vue
#	src/views/modules/volunteer/Projectreview/index.vue
#	src/views/modules/volunteer/Projectreview/process.vue
#	src/views/modules/volunteer/VolManage/enclosure.vue
#	src/views/modules/volunteer/VoluntaryOrganization/MemberManagement.vue
#	src/views/modules/volunteer/VoluntaryOrganization/add.vue
#	src/views/modules/volunteer/VoluntaryOrganization/index.vue
#	src/views/modules/volunteer/VoluntaryOrganization/info.vue
#	src/views/modules/volunteer/VoluntaryOrganization/process.vue
#	src/views/modules/volunteer/VolunteerProjects/add.vue
#	src/views/modules/volunteer/VolunteerProjects/edit.vue
#	src/views/modules/volunteer/VolunteerProjects/index.vue
#	src/views/modules/volunteer/VolunteerProjects/info.vue
#	src/views/modules/volunteer/VolunteerProjects/record.vue
#	src/views/modules/volunteer/VolunteerProjects/recruit.vue
#	src/views/modules/volunteer/activityArchive/process.vue

src/views/modules/shequzhili/peopleOpinons/opinionsDaily.vue

@@ -220,7 +220,7 @@ export default {
                 openFlag:"",
                 publicationPeople:"",
                 typeCode:"",
-                demandType: "",
+                demandType: "idea",
                 name: "",
                 mobile: "",
                 eventContent: "",

src/views/modules/shequzhili/solicitationSpecial/cpts/add.vue

@@ -316,9 +316,9 @@ export default {
                 subjectContent: [
                     { required: true, message: '征集内容不能为空', trigger: 'blur' }
                 ],
-                fileList: [
+                // fileList: [
-                    { required: true, message: '请选择活动照片', trigger: 'blur' }
+                //     { required: true, message: '请选择活动照片', trigger: 'blur' }
-                ]
+                // ]
             }
         },