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

doum

23 小时以前 6cf36f0e43c9add691b9a375526ce7dc26209574

 admin/src/components/business/OperaJkSketchResultWindow.vue

@@ -259,7 +259,8 @@
    },
    loadList () {
      this.api.allList({
        sketchId: this.model.id
        sketchId: this.model.id,
        type: 1
      }).then(res => {
        this.dataList = [...(res || [])]
        this.originDataList = JSON.parse(JSON.stringify(res||[]));