仓库预发机申请接口修复

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeOrder/ApplyMachineDTO.java

@@ -29,7 +29,7 @@ public class ApplyMachineDTO {
      * 仓库ID
      */
     @Schema(description = "仓库ID")
-    @NotNull(message = "仓库ID不能为空")
+//    @NotNull(message = "仓库ID不能为空")
     private Integer warehouseId;
 
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/kxsapp/StoreRecycleController.java

@@ -43,7 +43,6 @@ public class StoreRecycleController {
      * @param page 分页对象
      * @return 待回收机具-列表
      */
-    @Inner
     @GetMapping("/recycleMachineList")
     public R recycleMachineList(@ParameterObject Page<StoreRecycleMachineListVO> page, @Valid @ParameterObject StoreRecycleMachineListDTO param) {
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineApplyServiceImpl.java

@@ -424,7 +424,7 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public R orderCancel(KxsMachineApply param) {
         KxsMachineApply order = baseMapper.selectById(param.getId());
 

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsMachineRecycleMapper.xml

@@ -30,7 +30,6 @@
         <result column="brand_name" property="brandName"/>
         <result column="track_no" property="trackNo"/>
         <result column="order_sn" property="orderSn"/>
-        <result column="operatingDate" property="operatingDate"/>
         <result column="username" property="username"/>
         <result column="user_code" property="userCode"/>
         <result column="phone" property="phone"/>