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

guanqb

2024-02-18 9a39cd7607f0d0d73ce0dca855e6549eba6df6b5

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

 sh.exe.stackdump

@@ -1,7 +1,7 @@
Stack trace:
Frame        Function    Args
000FFFFB540  00180064365 (00180275F10, 00180266FD1, 000FFFFCA60, 000FFFFBA20)
000FFFFBA70  001800499D2 (00100002000, 0018034EB10, 00000000001, 00000000150)
000FFFFBA70  001800499D2 (00100002000, 0018034EB10, 00000000001, 0000000015C)
000FFFFCA80  00180049A11 (00000000001, 0018034EE20, 000FFFFCA60, 00000000008)
000FFFFCB10  0018005CFCD (00000000000, 000FFFFCC40, 001800DC3EF, 00000000000)
000FFFFCBF0  0018005D12B (000FFFFCDF0, 00000000000, FFFFFFFFFFFFFFD7, 00000000000)

 src/views/propertySupervision/propertyCompanyDistrict.vue

@@ -72,6 +72,7 @@
                viewBtn: true,
                selection: true,
                dialogClickModal: false,
                addBtn:false,
                column: [{
                    overHidden: true,
                    label: '小区名称',

 src/views/propertySupervision/propertyEvaluation.vue

@@ -109,6 +109,7 @@
                delBtn: false,
                selection: true,
                dialogClickModal: false,
                addBtn:false,
                column: [{
                    overHidden: true,
                    label: "物业公司名称",

 src/views/publicSecurity/bailReporting.vue

@@ -102,6 +102,7 @@
                editBtn: false,
                selection: true,
                dialogClickModal: false,
                header:false,
                column: [{
                    span: 12,
                    label: "社区",