Merge remote-tracking branch 'origin/dev1.0' into dev1.0

admin-ui/src/views/system/dept/edit.vue

@@ -11,7 +11,7 @@
         </el-form-item>
       </div>
       <el-row>
-        <el-col :span="8">
+        <el-col :span="10">
           <el-form-item label="显示排序" prop="orderNum"><el-input-number v-model="form.orderNum" controls-position="right" :min="0" /></el-form-item>
         </el-col>
         <el-col :span="8">

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Visit.java

@@ -25,6 +25,8 @@ public class Visit {
     private Long cardId;
     @ApiModelProperty(value = "患者分类")
     private String patClass;
+    @ApiModelProperty(value = "科室代码")
+    private String deptCode;
     @ApiModelProperty(value = "科室")
     private String department;
     @ApiModelProperty(value = "床位")