Pu Zhibing
6 天以前 870ee717e24b9e08891ae725ec25e2714102842a
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
3个文件已修改
5 ■■■■■ 已修改文件
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tDriverPromotionActivity_add.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml
@@ -34,6 +34,7 @@
        <if test="null != abnormalStatus">
            and o.payStatus = #{abnormalStatus}
        </if>
        order by o.createTime desc
    </select>
</mapper>
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tDriverPromotionActivity_add.html
@@ -167,7 +167,7 @@
        var ajax = new $ax(Feng.ctxPath + "/tDriverPromotionActivity/add", function(data){
            if(data=="602"){
                Feng.error("活动时间已重复");
                Feng.error("该区域活动时间存在重复时间段,请核实后添加!");
            }else {
                Feng.success("添加成功!");
                TDriverPromotionActivityInfoDlg.close();
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
@@ -140,7 +140,7 @@
                @if(isNotEmpty(item.orderMoney) && item.orderMoney > 0){
                    <div class="col-sm-6 b-r">
                        <#label id="orderMoney" name="订单总价" value="${item.orderMoney}元"/>
                        <#label id="travelMoney" name="行程费" value="${item.travelMoney}元"/>
                        <#label id="travelMoney" name="行程费" value="${item.mileageMoney}元"/>
                        <#label id="parkMoney" name="停车费" value="${item.parkMoney}元"/>
                        <#label id="roadTollMoney" name="过路费" value="${item.roadTollMoney}元"/>
                        <#label id="tipMoney" name="小费" value="${item.tipMoney}元"/>