修改order代码

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java

@@ -57,7 +57,7 @@ public class OrderController extends BaseController {
 
 
 
-    @ApiOperation("查询订单售后列表")
+    @ApiOperation("查询订单列表")
     @PostMapping("/list")
     public R<Page<OrderVO>> list(@RequestBody OrderBo query, Page<Order> page) {
         Page<Order> list =  service.page(page,query.toWrapper() );

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java

@@ -52,7 +52,7 @@ public class OrderDeliveryHistoryController extends BaseController {
 //        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
 //    }
 
-    @ApiOperation("查询订单表列表")
+    @ApiOperation("查询订单发货列表")
     @PostMapping("/list")
     public R<IPage<OrderDeliveryHistoryVO>> list(@RequestBody OrderDeliveryHistoryBo query, Page<OrderDeliveryHistory> page) {
         Page<OrderDeliveryHistory> list =  historyService.page(page,query.toWrapper() );

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/OrderItem.java

@@ -24,7 +24,8 @@ public class OrderItem extends BaseAudit {
     @ApiModelProperty("ID")
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
-
+    @Excel(name = "商家备注")
+    private String merchantNote;
     @ApiModelProperty("订单id")
     @Excel(name = "订单id")
     private Long orderId;

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java

@@ -31,6 +31,7 @@ public class OrderVO extends BaseAudit {
    /** 用户帐号 */
     @Excel(name = "用户帐号")
     private String memberUsername;
+
     /** 商家备注 */
     @Excel(name = "商家备注")
     private String merchantNote;