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

gaoluyang

2 天以前 7a5c5250b66cc6faffbcac9e192073473c50f79f

 src/views/im/manager/channel/list/data.ts

@@ -41,9 +41,6 @@
      fieldName: 'avatar',
      label: '频道头像',
      component: 'ImageUpload',
      componentProps: {
        maxNumber: 1
      },
      rules: 'required'
    },
    {