Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-30 c2c72dc1a413036c88672b38faf74e02093fae85

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/operate/images/index.vue
#	src/views/operate/video/index.vue

 src/views/operate/message/myIndex/index.vue

@@ -148,14 +148,14 @@
                    label: '批量操作',
                    disabled: true,
                },
                {
                    value: 1,
                    label: '批量启用',
                },
                {
                    value: 2,
                    label: '批量禁用',
                },
                // {
                //     value: 1,
                //     label: '批量启用',
                // },
                // {
                //     value: 2,
                //     label: '批量禁用',
                // },
                {
                    value: 3,
                    label: '批量删除',
@@ -248,7 +248,7 @@
            endTime: this.datetime ? this.datetime[1] : null
          }
          getMessageList(messageParam)
              .then(({ records, total,size }) => {
              .then(({ records, total ,size}) => {
                this.tableData = records;
                this.totalNum = total;
                this.pageSize=size;