合并冲突

mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewOrderPO.java

@@ -97,13 +97,4 @@ public class ReviewOrderPO extends BaseVOEntity {
     /** 详情与上架单一致：头字段扁平 + 明细列表 */
     @ApiModelProperty("复核明细")
     private List<ReviewMaterialDetailPO> materialDetailList;
-
+}
-//    @ApiModelProperty("货主id")
-//    private String shipperId;
-//
-//    @ApiModelProperty("货主编码")
-//    private String shipperCode;
-//
-//    @ApiModelProperty("货主名字")
-//    private String shipperName;
-}