Merge remote-tracking branch 'origin/master'

k94314517

2024-02-23 3c456949b70671cc2ad95ad5395dfaceda519f17

 company/src/components/enterprise/selectSolutions.vue

@@ -41,14 +41,14 @@
                prop="worktypeName"
                label="所属工种">
            </el-table-column>
            <el-table-column
                prop="startTime"
                label="保险生效起期">
            </el-table-column>
            <el-table-column
                prop="endTime"
                label="保险生效止期">
            </el-table-column>
<!--            <el-table-column-->
<!--                prop="startTime"-->
<!--                label="保险生效起期">-->
<!--            </el-table-column>-->
<!--            <el-table-column-->
<!--                prop="endTime"-->
<!--                label="保险生效止期">-->
<!--            </el-table-column>-->
        </el-table>
    </GlobalWindow>
</template>
@@ -97,7 +97,8 @@
            },
            getList() {
                findList({
                    memberId: this.id
                    memberId: this.id,
                    status: 1
                }).then(res => {
                    this.list = res
                })