diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/domain/TbProductVo.java b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/domain/TbProductVo.java
index 1c36cea6..5c38ed0d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/domain/TbProductVo.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/domain/TbProductVo.java
@@ -39,7 +39,7 @@ public class TbProductVo {
     private BigDecimal lowPrice;
 
 
-    private Integer unitId;
+    private String unitId;
 
 
     private String coverImg;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/domain/TbProductStockDetail.java b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/domain/TbProductStockDetail.java
index 65c28704..3f316db2 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/domain/TbProductStockDetail.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/domain/TbProductStockDetail.java
@@ -89,7 +89,7 @@ public class TbProductStockDetail implements Serializable {
 
     @Column(name = "`sub_type`",nullable = false)
     @NotNull
-    @ApiModelProperty(value = " 1入库2出库")
+    @ApiModelProperty(value = " 1入库 -1出库")
     private Integer subType;
 
     @Column(name = "`type`",nullable = false)
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/rest/TbProductStockDetailController.java b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/rest/TbProductStockDetailController.java
index f3e20761..9b3de685 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/rest/TbProductStockDetailController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/rest/TbProductStockDetailController.java
@@ -62,7 +62,7 @@ public class TbProductStockDetailController {
     @PostMapping("/stock")
     @Log("查询/product/Stock")
     @ApiOperation("查询/product/Stock")
-    @PreAuthorize("@el.check('tbProductStockDetail:list')")
+//    @PreAuthorize("@el.check('tbProductStockDetail:list')")
     public ResponseEntity<Object> queryPage(@RequestBody TbProductStockDetailQueryCriteria criteria){
         return new ResponseEntity<>(tbProductStockDetailService.queryPage(criteria),HttpStatus.OK);
     }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailDto.java b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailDto.java
index c18dba4d..b822f0da 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailDto.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailDto.java
@@ -62,7 +62,7 @@ public class TbProductStockDetailDto implements Serializable {
     /** 关联订单Id */
     private String orderId;
 
-    /**  1入库2出库 */
+    /**  1入库 -1出库 */
     private Integer subType;
 
     /** purchase采购入库 transfer调拔入库
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/impl/TbProductStockDetailServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/impl/TbProductStockDetailServiceImpl.java
index 2dade512..7333bb43 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/impl/TbProductStockDetailServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/impl/TbProductStockDetailServiceImpl.java
@@ -133,7 +133,7 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
             map.put("操作批次号", tbProductStockDetail.getBatchNumber());
             map.put("库存操作来源：收银端调用 CASHIER   系统后台调用SHOP", tbProductStockDetail.getSourcePath());
             map.put("关联订单Id", tbProductStockDetail.getOrderId());
-            map.put(" 1入库2出库", tbProductStockDetail.getSubType());
+            map.put(" 1入库-1出库", tbProductStockDetail.getSubType());
             map.put("purchase采购入库 transfer调拔入库 ", tbProductStockDetail.getType());
             map.put("上次剩余数量", tbProductStockDetail.getLeftNumber());
             map.put("出入库时间", tbProductStockDetail.getStockTime());
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/rest/TbProductStockOperateController.java b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/rest/TbProductStockOperateController.java
index bbcb3087..f7960bb1 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/rest/TbProductStockOperateController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/rest/TbProductStockOperateController.java
@@ -80,7 +80,7 @@ public class TbProductStockOperateController {
     @PostMapping("/outAndOn")
     @Log("新增/product/StockOperate")
     @ApiOperation("新增/product/StockOperate")
-    @PreAuthorize("@el.check('tbProductStockOperate:add')")
+//    @PreAuthorize("@el.check('tbProductStockOperate:add')")
     public ResponseEntity<Object> createOutAndONOperate(@RequestBody OutAndOnDto outAndOnDto){
         return new ResponseEntity<>(tbProductStockOperateService.createOutAndONOperate(outAndOnDto),HttpStatus.CREATED);
     }