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

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java

@@ -86,7 +86,7 @@ public class BasicdataVehicleController extends BladeController {
 	public R<BasicdataVehicleVO> detail(@Param("id") Long id) {
 
 //		BasicdataVehicleEntity detail = basicdataVehicleService.getOne(Condition.getQueryWrapper(basicdataVehicle));
-		BasicdataVehicleEntity detail = basicdataVehicleService.getVehicleDetail(id);
+		BasicdataVehicleVO detail = basicdataVehicleService.getVehicleDetail(id);
 		//查询历史照片
 		BasicdataVehicleVO basicdataVehicleVO = new BasicdataVehicleVO();
 		BeanUtils.copyProperties(detail,basicdataVehicleVO);

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java

@@ -69,5 +69,5 @@ public interface BasicdataVehicleMapper extends BaseMapper<BasicdataVehicleEntit
 	 * @param id
 	 * @return
 	 */
-	BasicdataVehicleEntity getVehicleDetail(@Param("id")Long id);
+	BasicdataVehicleVO getVehicleDetail(@Param("id")Long id);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml

@@ -252,7 +252,7 @@
         and vehicle_nub like concat('%',#{carNumber},'%')
         limit 10
     </select>
-    <select id="getVehicleDetail" resultType="com.logpm.basicdata.entity.BasicdataVehicleEntity">
+    <select id="getVehicleDetail" resultType="com.logpm.basicdata.vo.BasicdataVehicleVO">
         SELECT
         lbv.id id,
         lbv.tenant_id tenantId,

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehicleService.java

@@ -99,5 +99,5 @@ public interface IBasicdataVehicleService extends BaseService<BasicdataVehicleEn
 	 * @param id
 	 * @return
 	 */
-	BasicdataVehicleEntity getVehicleDetail(Long id);
+	BasicdataVehicleVO getVehicleDetail(Long id);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java

@@ -295,7 +295,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 	}
 
 	@Override
-	public BasicdataVehicleEntity getVehicleDetail(Long id) {
+	public BasicdataVehicleVO getVehicleDetail(Long id) {
 		return baseMapper.getVehicleDetail(id);
 	}