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

src/views/basicData/facultyManagement/detailsPage.vue

@@ -157,6 +157,15 @@ export default {
             span: 6
           },
           {
+            label: "校龄",
+            prop: "schoolAge",
+            type: "number",
+            controls: false,
+            precision:0,
+            minRows: 0,
+            span: 6
+          },
+          {
             label: "所在部门",
             prop: "inSection",
             type: "select",

src/views/basicData/facultyManagement/index.vue

@@ -198,6 +198,10 @@ export default {
             span: 8
           },
           {
+            label: "校龄",
+            prop: "schoolAge"
+          },
+          {
             label: "所在部门",
             prop: "inSection"
           },