java/IgoTravel.git

			@@ -8,8 +8,10 @@
			<result column="account" property="account" />
			<result column="jobNumber" property="jobNumber" />
			<result column="phone" property="phone" />
			<result column="phoneOperator" property="phoneOperator" />
			<result column="password" property="password" />
			<result column="name" property="name" />
			<result column="lastName" property="lastName" />
			<result column="firstName" property="firstName" />
			<result column="sex" property="sex" />
			<result column="idCard" property="idCard" />
			<result column="companyId" property="companyId" />
			@@ -86,8 +88,10 @@
			account as account,
			jobNumber as jobNumber,
			phone as phone,
			phoneOperator as phoneOperator,
			password as password,
			name as name,
			lastName as lastName,
			firstName as firstName,
			sex as sex,
			idCard as idCard,
			companyId as companyId,
			@@ -175,8 +179,10 @@
			account as account,
			jobNumber as jobNumber,
			phone as phone,
			phoneOperator as phoneOperator,
			password as password,
			name as name,
			lastName as lastName,
			firstName as firstName,
			sex as sex,
			idCard as idCard,
			companyId as companyId,
			@@ -272,7 +278,7 @@
			b.id as orderId,
			b.state as state,
			a.id as driverId,
			a.`name` as `name`,
			CONCAT(a.firstName, " ", a.lastName) as `name`,
			a.headImgUrl as avatar,
			case when b.telX is null then a.phone else b.telX end as phone,
			c.carLicensePlate as carCode,
			@@ -314,7 +320,7 @@
			select
			a.id as id,
			a.headImgUrl as avatar,
			a.`name` as `name`,
			CONCAT(a.firstName, " ", a.lastName) as as `name`,
			a.phone as phone,
			a.idCard as idcode,
			b.carLicensePlate as licensePlate,
			@@ -343,7 +349,7 @@
			select
			id as id,
			phone as phone,
			name as name,
			CONCAT(firstName, " ", lastName) as as name,
			headImgUrl as avatar,
			DATE_FORMAT(insertTime,'%Y/%m/%d %H:%i') as insertTime
			from