Merge remote-tracking branch 'origin/master'

puzhibing

2023-02-17 e2e97b3153d4c2e052763ffed3710e12848c995d

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml

@@ -30,11 +30,30 @@
        <result column="state" property="state" />
        <result column="status" property="status" />
        <result column="createTime" property="createTime" />
        <result column="startDistance" property="startLng" />
        <result column="startPrice" property="endAddress" />
        <result column="overDriveDistance" property="endLat" />
        <result column="overDrivePrice" property="endLng" />
        <result column="longDistance" property="boardingTime" />
        <result column="longDistancePrice" property="getoffTime" />
        <result column="overLongDistance" property="estimatedPrice" />
        <result column="overLongDistancePrice" property="orderMoney" />
        <result column="waitTime" property="payMoney" />
        <result column="waitTimePrice" property="discountedPrice" />
        <result column="outWaitTime" property="couponId" />
        <result column="outWaitTimePrice" property="payType" />
        <result column="badWeatherDistance" property="payTime" />
        <result column="badWeatherPrice" property="state" />
        <result column="overBadWeatherDistance" property="status" />
        <result column="overBadWeatherPrice" property="createTime" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, code, userId, driverId, source, agentId, branchOfficeId, startTime, startAddress, startLat, startLng, endAddress, endLat, endLng, boardingTime, getoffTime, estimatedPrice, orderMoney, payMoney, discountedPrice, couponId, payType, payTime, state, status, createTime
        id, code, userId, driverId, source, agentId, branchOfficeId, startTime, startAddress, startLat, startLng, endAddress, endLat, endLng,
            boardingTime, getoffTime, estimatedPrice, orderMoney, payMoney, discountedPrice, couponId, payType, payTime, state, status, createTime,
            startDistance,startPrice,overDriveDistance,overDrivePrice,longDistance,longDistancePrice,overLongDistance,overLongDistancePrice,
waitTime,waitTimePrice,outWaitTime,outWaitTimePrice,badWeatherDistance,badWeatherPrice,overBadWeatherDistance,overBadWeatherPrice
    </sql>

</mapper>