Merge branch 'mergeBranch' into allTestUrgent

src/HManagement/notice/index.vue

@@ -174,10 +174,9 @@ export default {
     },
     /* 用户类型 */
     async getAccountType () {
-      let res = await this.$store.dispatch('optiontypeselect','accounttype')
+      let res = await this.$store.dispatch('optiontypeselect','usertype')
       this.accountType = res.data
-      console.log(this.accountType);
-
+      console.log(this.accountType,'eeee');
     },
     async getClassList () {
       let res = await this.$api.requested({

src/HManagement/notice/list/modules/message.vue

@@ -24,8 +24,8 @@
           >
             <el-option
               v-for="(item,index) in accountType()"
-              :label="item.value"
-              :value="item.remarks"
+              :label="item.remarks"
+              :value="item.value"
               :key="index"
             ></el-option>
           </el-select>
@@ -177,4 +177,4 @@ export default {
   height: 80%;
   width: 100%;
 }
-</style>
+</style>