Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

hsy

5 天以前 5a90852489e1bf91d386746d75cfa0066c271228

 src/views/im/manager/face/pack/data.ts

@@ -22,9 +22,6 @@
      fieldName: 'icon',
      label: '封面',
      component: 'ImageUpload',
      componentProps: {
        maxNumber: 1,
      },
    },
    {
      fieldName: 'name',
@@ -166,9 +163,6 @@
      fieldName: 'url',
      label: '表情图',
      component: 'ImageUpload',
      componentProps: {
        maxNumber: 1,
      },
      rules: 'required',
    },
    {