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

shuishen

2024-01-29 2cec09706b01d65def3f945bdcde13e620a71c2e

 src/views/cGovernance/gridWorkLog.vue

@@ -51,7 +51,7 @@
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                border: false,
                border: true,
                //stripe:true,
                index: true,
                viewBtn: true,
@@ -66,6 +66,7 @@
                        span: 12,
                        searchSpan: 4,
                        search: true,
                        searchLabelWidth: 76,
                        type: "select",
                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=haveType",
                        dataType: "number",