java/mx_charging_pile.git

			@@ -107,6 +107,7 @@
			<if test="endTime1 != null and endTime1!=''">
			and (t1.end_time between #{endTime1} and #{endTime2})
			</if>
			and t1.del_flag = 0
			</select>
			<select id="payOrderQuery" resultType="com.ruoyi.order.dto.PayOrderDto">
			SELECT o.*,i.phone FROM (SELECT
			@@ -187,6 +188,7 @@
			LEFT JOIN `charging_pile_account`.`t_app_user` i on o.app_user_id = i.id
			<where>
			o.del_flag = 0

			<if test="data.code != null and data.code != ''">
			AND o.code LIKE CONCAT('%',#{data.code},'%')
			</if>
			@@ -773,6 +775,7 @@
			SELECT
			count(1) as counts,vehicle_use
			from charging_pile_account.t_app_user_car
			where del_flag = 0
			GROUP BY vehicle_use
			</select>
			<select id="carUserBrand" resultType="java.util.Map">
			@@ -780,6 +783,7 @@
			SELECT
			count(1) as counts,vehicle_brand
			from charging_pile_account.t_app_user_car
			where del_flag = 0
			GROUP BY vehicle_brand
			</select>
			<select id="countLocalCar" resultType="java.util.Map">