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

yanderong

4 天以前 7617d46abee2950b7336e3379f8c7a564939cb54

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TVinChargingOrderMapper.xml

@@ -42,6 +42,7 @@
        SELECT COUNT(1)
        FROM t_vin_charging_order o
        WHERE o.del_flag = 0
          AND o.app_user_id = #{appUserId}
          AND o.vin_id IN
        <foreach collection="vinIds" item="vinId" open="(" separator="," close=")">
            #{vinId}
@@ -63,6 +64,7 @@
               ) THEN 2 ELSE 1 END AS evaluate
        FROM t_vin_charging_order o
        WHERE o.del_flag = 0
          AND o.app_user_id = #{appUserId}
          AND o.vin_id IN
        <foreach collection="vinIds" item="vinId" open="(" separator="," close=")">
            #{vinId}