海恒-鸿瑞堂
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
puzhibing
5 天以前 7876cd5977af240d28d59d18d7a06344d36d4d32 
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java


@@ -9,12 +9,12 @@


import com.ruoyi.order.domain.vo.*;


import com.ruoyi.order.service.order.OrderService;


import com.ruoyi.system.api.constant.AppErrorConstant;


import com.ruoyi.system.api.domain.poji.goods.Goods;


import com.ruoyi.system.api.model.AddOrderVo;


import com.ruoyi.system.api.service.RemoteGoodsService;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestMethod;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import java.util.Date;


@@ -235,4 +235,6 @@


        return R.ok(page.setRecords(merOrderPageVoList));


    }




}






}