Merge branch 'ww' into otherChange

# Conflicts:
#	public/config.json
ww
wangwei 3 years ago
commit 239b376eb3

@ -638,7 +638,7 @@ export default {
this.detailQuery = { this.detailQuery = {
orderIdFk: "", orderIdFk: "",
page: 1, page: 1,
limit: 200 limit: 20
} }
this.detailList = []; this.detailList = [];
this.detailTotal = 0; this.detailTotal = 0;

Loading…
Cancel
Save