diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
index 9df9c68b..9375e63a 100644
--- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
+++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
@@ -39,7 +39,8 @@ import java.util.stream.Collectors;
 public class JwtUtil {
 
 	/**Token有效期为7天（Token在reids中缓存时间为两倍）*/
-	public static final long EXPIRE_TIME = (7 * 12) * 60 * 60 * 1000;
+//	public static final long EXPIRE_TIME = (7 * 12) * 60 * 60 * 1000;
+	public static final long EXPIRE_TIME = (12) * 60 * 60 * 1000;
 	static final String WELL_NUMBER = SymbolConstant.WELL_NUMBER + SymbolConstant.LEFT_CURLY_BRACKET;
 
     /**
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
index 93fa63c3..658d7c18 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
@@ -918,13 +918,14 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         }
         QueryWrapper<BlWarehouseMaterialInfo> queryWrapper = new QueryWrapper<>() ;
         queryWrapper.eq("nu_id",cgdInfoEntityDto.getNuId());
-        queryWrapper.apply("kcsl <= lower_limit");//库存小于下限的数据
+        queryWrapper.apply("ljkcsl <= lower_limit");//库存小于下限的数据
         queryWrapper.eq("del_flag","0");//查询未删除的数据
         queryWrapper.eq("iz_enabled","Y");//查询启用的数据
         queryWrapper.eq("isAdd","0");//查询未在购物车里的数据
 //        queryWrapper.last("limit " + (3-listqg.size()));
         //库存预警数据
-        List<BlWarehouseMaterialInfo> list = mterialInfoMapper.selectWaringList(queryWrapper);
+        Page<BlWarehouseMaterialInfo> page = new Page<>(1, 1000);
+        List<BlWarehouseMaterialInfo> list = mterialInfoMapper.queryCgdWaringList(page,queryWrapper);
         //供应商集合
         List<ConfigSuppliersInfo> gysList = gysMapper.selectList(new QueryWrapper<ConfigSuppliersInfo>().eq("del_flag","0"));
         int count = listqg.size();