Merge remote-tracking branch 'origin/master'

doum

昨天 0d0e67818a45161af14114211f43aafd232a6da2

 admin/src/components/business/OperaAreasWindow.vue

@@ -10,7 +10,7 @@
        <el-input v-model="form.name" :placeholder="form.type==0?'输入市名称':'输入县区名称'" v-trim/>
      </el-form-item>
      <el-form-item label="排序码" prop="sortnum">
        <el-input v-model="form.sortnum" placeholder="请输入排序码" v-trim/>
        <el-input v-model="form.sortnum" type="number"  placeholder="请输入排序码" v-trim/>
      </el-form-item>
    </el-form>
  </GlobalAlertWindow>