Merge branch 'dev_海西州_北京同仁堂' into dev_海西州_惠牧

gaoluyang

8 天以前 534533425b15b183cea60fa162d9884e5d3c6243

 src/views/hrm/salary/employee-social-security/data.ts

@@ -166,7 +166,7 @@
      field: 'createTime',
      title: '创建时间',
      width: 180,
      formatter: 'formatDateTime',
      formatter: 'formatDate',
    },
    {
      title: '操作',