Merge remote-tracking branch 'john/John/release-2.18.0/KIP-10659' into John/release-2.18.0/KIP-10659

# Conflicts:
#	src/pages/parkingFee/mixins/vehicleAddOrEdit.js
#	src/pages/parkingFeeV2/mixins/vehicleAddOrEdit.js

src/pages/parkingFee/mixins/vehicleAddOrEdit.js

@@ -82,6 +82,7 @@ export default {
       this.ind = 0;
       this.active = 0;
       this.carType = index;
+
       if (this.carType == '1') {
         this.numArr = [
           this.numArr[0],