Merge remote-tracking branch 'origin/feature_dev_20221125_YW' into fix_2nd_period

# Conflicts: # jero-boot/db/蔚来标准sql/dev_2nd_period.sql # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
2022-12-28 09:58:11 +08:00
parent 4633d465f3 83b805edaa
commit f4d1b8676a
11 changed files with 930 additions and 9 deletions
@@ -1654,7 +1654,10 @@
          _array.push(item.id)
        })
        let _this = this
-        let param = { ids: _array.join(',') }
+        let param = { ids: _array.join(','),
+          currentPersonRole: this.currentPersonRole,
+          paramsManifestId: this.$route.query.id
+        }
        this.textLoading = true
        axios({
          url: '/jero-boot/params/collectManifest/back',