Merge remote-tracking branch 'origin/2.3' into 2.3

yanderong

4 天以前 7617d46abee2950b7336e3379f8c7a564939cb54

 ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/mapper/VinChargingOrderMapperStructureTest.java

@@ -37,6 +37,7 @@
        assertTrue(mapper.contains("group by charging_order_id"));
        assertTrue(mapper.contains("pageappletorders"));
        assertTrue(mapper.contains("o.vin_id in"));
        assertTrue(mapper.contains("o.app_user_id = #{appuserid}"));
        assertTrue(mapper.contains("order by o.create_time desc, o.id desc"));
        assertTrue(mapper.contains("limit #{offset}, #{pagesize}"));
        assertTrue(mapper.contains("getchargingvinstatus"));