解决冲突

liuyg

2021-08-14 ff066fb8d926d9a75efdcfdfc1b37f890cd98d82

 src/views/securityUnitChild/data.js

@@ -42,7 +42,7 @@
        disabled: true,
    },
    {
        label: "成立日期",
        label: "注册时间",
        prop: "establishtime",
        span: 11,
        labelWidth: 130,