java/QianYunTong.git

java / QianYunTong

黔云通

概况
操作记录
提交次数
目录
文档
派生
对比

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-07-26 0b5d21c6338bb3bd094a5bf2379001c4e9772eb5

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml

@@ -349,7 +349,12 @@
      h.remark as cancelRemark,
      CONCAT(j.startTime, '-', j.endTime) as lineShiftTime,
      a.holidayFee,
      a.discountAmount as taxiCardMoney
      a.discountAmount as taxiCardMoney,
        a.responsibilityType,
        a.abnormalStatus,
        a.abnormalRemark,
        a.abnormalIntro,
        a.abnormalImg
        from t_order_cross_city a
      left join t_driver b on (a.driverId = b.id)
      left join t_car c on (a.carId = c.id)

			@@ -349,7 +349,12 @@
			h.remark as cancelRemark,
			CONCAT(j.startTime, '-', j.endTime) as lineShiftTime,
			a.holidayFee,
			a.discountAmount as taxiCardMoney
			a.discountAmount as taxiCardMoney,
			a.responsibilityType,
			a.abnormalStatus,
			a.abnormalRemark,
			a.abnormalIntro,
			a.abnormalImg
			from t_order_cross_city a
			left join t_driver b on (a.driverId = b.id)
			left join t_car c on (a.carId = c.id)