Merge remote-tracking branch 'origin/master'

doum

10 小时以前 1382e80f33270e77e06414ce8ad3f085fde6142a

 admin/src/components/business/OperaArticleLabelsWindow.vue

@@ -30,7 +30,7 @@
        />
      </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>