Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory

shuishen

2021-11-24 ed1cc56b6bca56689d8cd46c0c5de0cf197cb07d

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory

 src/views/statisticalQueryManagement/businessStatisticsFwdq.vue

@@ -92,7 +92,7 @@
          },
          {
            label: "所属保安公司",
            prop: "tenantName",
            prop: "deptName",
            width: 300,
            display: false
          },
@@ -107,8 +107,8 @@
            display: false
          },
          {
            label: "保安员姓名",
            prop: "realName",
            label: "保安员数量",
            prop: "num",
            display: false
          },
          {

 src/views/statisticalQueryManagement/securityGuardDetail.vue

@@ -220,7 +220,7 @@
            label: "是否持证",
            prop: "hold",
            type: "select",
            search: true,
            search: !this.paramCz,
            searchSpan: 4,
            dicData: [
              {