Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java

@@ -44,9 +44,9 @@ public class WisdomCarVo {
         @ApiModelProperty("患者id")
         private Long patientId;
         @ApiModelProperty("平车id")
-        private Long carNumber;
-        @ApiModelProperty("平车信息id")
         private Long carId;
+        @ApiModelProperty("平车信息id")
+        private String carNumber;
         @ApiModelProperty("开始时间")
         private Long startTime;
         @ApiModelProperty("结束时间")

wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml

@@ -19,8 +19,8 @@
 		select
 		a.id as patientCarId,
 		a.patient_id as patientId,
-		a.car_id as carNumber,
-		b.id as carId,
+		a.car_id as carId,
+		b.car_number as carNumber,
 		a.start_time as startTime,
 		a.end_time as endTime
 		from t_patient_wisdom_car a,t_wisdom_car b