Merge remote-tracking branch 'origin/master'

mitao

2024-06-04 addc1634a32502648e432ec52b89563b2b349cc6

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMallMapper.java

@@ -1,7 +1,7 @@
package com.ruoyi.order.mapper;

import com.ruoyi.order.domain.pojo.OrderMall;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.OrderMall;

/**
 * <p>