Merge remote-tracking branch 'origin/dev' into dev

maven

2 天以前 7f9b99a28cd983fa55b5788519682e4794cf6cb0

 src/views/system/dept/index.vue

@@ -99,7 +99,7 @@
               </el-col>

               <el-col :span="12">

                  <el-form-item label="显示排序" prop="orderNum">

                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />

                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0"/>

                  </el-form-item>

               </el-col>

               <el-col :span="12">