Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

shuishen

2021-09-13 b8dfc98b089e47fdb3e269941bbd2de3f7fb7de1

 src/views/securityUnit/selfRecruitedSecurityGuard.vue

@@ -304,7 +304,24 @@
        border: true,

        selection: true,
        column: column,
        column: [
          ...column,
          {
            label: "服务区域",
            labelWidth: 160,
            prop: "fregion",
            width: 69,
          },
          {
            label: "服务时间",
            labelWidth: 160,
            prop: "ftime",
            width: 69,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "timestamp",
          },
        ],
      },
    };
  },