diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
index b201125..9144866 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
@@ -87,7 +87,7 @@ public class TbProduct implements Serializable {
     private String specInfo;
     private String selectSpec;
     @TableField(exist = false)
-    private TbShopUnit unitName;
+    private String unitName;
 
 
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index 24e5943..ca7666b 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -158,10 +158,8 @@ public class ProductService {
                 it.setSkuList(skuWithBLOBs);
 
                 it.setGroundingSpecInfo(querySpec(Integer.valueOf(shopId), it.getId()));
-                if (it.getUnitId() != null) {
-
-                }
-                it.setUnitName(finalShopUnitsMap.get(it.getUnitId()));
+                TbShopUnit tbShopUnit = finalShopUnitsMap.get(it.getUnitId());
+                it.setUnitName(tbShopUnit == null ? null : tbShopUnit.getName());
             });
         }
         PageInfo pageInfo=new PageInfo(tbProductWithBLOBs);