Merge remote-tracking branch 'origin/master'

zengh

2021-03-03 90ee0a2139d541cfd5ea6cfa2ee179cee90352a7

 src/views/clientManagement/clientManagement.vue

@@ -255,12 +255,23 @@
            }, {
              label: "缴费信息",
              prop: "pay",
            }, {
            },
            {
              label: "设备类型",
              prop: "deviceType",
              width: 150,
              search: true,
            }, {
              searchSpan: 3,
              searchLabelWidth: 80,
              searchPlaceholder: "请选择",
              type: "select",
              props: {
                label: "dictValue",
                value: "dictValue"
              },
              dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1357568691367661569",
              span: 6
            },
            {
              label: "权属",
              prop: "ownership",
            }, {