Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2024-09-11 de31553ec8f08f9e859dd88fbfbf66cc07405311

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

# Conflicts:
#	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppCouponMapper.xml

@@ -55,7 +55,7 @@
                AND t1.del_flag = 0
            </if>
        </where>
        ORDER BY create_time DESC
        ORDER BY t1.create_time DESC
    </select>
    <select id="couponList" resultType="com.ruoyi.other.api.vo.CouponListVOVO">
        SELECT