Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

Lou

2024-01-11 f54ba6cd72447a2b16fa999a768dc6efdaa0c5ae

 src/views/article/components/discussionManageChild.vue

@@ -7,7 +7,9 @@
</template>

<script>
import { getPersonPublicSelect } from "@/api/public"
  import {
    getPersonPublicSelect
  } from "@/api/public"

import {
    getListPd,
@@ -84,12 +86,13 @@
                addBtn: false,
                searchMenuSpan: 3,
                menuWidth: 500,
                column: [{
                    label: '标题',
                    prop: 'title',
                    searchSpan: 4,
                    span: 6,
                },
          column: [
            //   {
            //     label: '标题',
            //     prop: 'title',
            //     searchSpan: 4,
            //     span: 6,
            // },
                {
                    label: '参与人数',
                    prop: 'topsCount',
@@ -189,13 +192,11 @@
                        value: 'id',
                    },
                    dicData: [],
                    rules: [
                        {
              rules: [{
                            required: true,
                            message: '请输入姓名',
                            trigger: 'blur'
                        }
                    ],
              }],
                },

                {