Merge remote-tracking branch 'origin/master'

rk

10 天以前 bd491c37218b0b3d9b518e4814967d814e781c02

 admin/src/components/business/OperaGoodsLabelsWindow.vue

@@ -28,7 +28,7 @@
        </el-select>
      </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>