Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@@ -190,7 +190,7 @@
     <select id="selectByVehicleSid" resultType="com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate">
         select *
         from base_vehicle_certificate
-        where vehicleSid = #{carSid}
+        where vehicleSid = #{carSid} limit 1
     </select>
 
     <select id="checkByCertificationNo" resultType="int">

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@@ -178,7 +178,7 @@
             <el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center" />
             <el-table-column label="车架号" align="left" header-align="center">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.vinNo" placeholder="" style="width: 80%" @change="changeVinNo" clearable type="text" maxlength="17"/>
+                <el-input v-model.trim="scope.row.vinNo" placeholder="" style="width: 80%" @change="changeVinNo" clearable type="text" maxlength="17"/>
               </template>
             </el-table-column>
             <el-table-column label="发动机号" align="left" header-align="center">

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@@ -177,7 +177,7 @@
             <el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center" />
             <el-table-column label="车架号" align="left" header-align="center">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.vinNo" placeholder="" style="width: 80%" @change="changeVinNo" clearable type="text" maxlength="17"/>
+                <el-input v-model.trim="scope.row.vinNo" placeholder="" style="width: 80%" @change="changeVinNo" clearable type="text" maxlength="17"/>
               </template>
             </el-table-column>
             <el-table-column label="发动机号" align="left" header-align="center">