Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

昨天 cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5

 admin/src/components/business/OperaCarsWindow.vue

@@ -187,7 +187,7 @@
    },
    getCate () {
      fetchList({
        model: {},
        model: {type:1},
        capacity: 1000,
        page: 1
      }).then(res => {