Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4

# Conflicts:
#	src/main/resources/static/components/module/activity/UserScope.vue

src/main/resources/static/components/module/activity/UserDataScope.vue

@@ -148,6 +148,7 @@
             :prop="column.prop"
             :key="column.prop"
             :sortable="column.sortable"
+            :formatter="column.formatter"
         ></el-table-column>
         <el-table-column align="center" header-align="center" label="操作" width="100">
           <template slot-scope="{ row }">
@@ -232,7 +233,7 @@ module.exports = {
         {prop: "loginName", label: "工号"},
         {prop: "userName", label: "姓名"},
         {prop: "sex", label: "性别", sortable: true},
-        {prop: "birthday", label: "出生年月"},
+        {prop: "birthday", label: "出生年月", formatter: this.formatDate},
         {prop: "mobile", label: "联系电话"},
         {prop: "personType", label: "教职工类别", sortable: true},
         {prop: "userState", label: "在职状态", sortable: true},
@@ -263,6 +264,9 @@ module.exports = {
       }
       return group.groupName + "（人员结果）"
     },
+    formatDate(row, column, cellValue) {
+      return cellValue ? moment(cellValue).format("YYYY-MM-DD") : ""
+    },
     viewGroupName() {
       if (this.pageForm.groupId) {
         const group = this.activityGroupList.find((v) => v.groupId === this.pageForm.groupId)