diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/AppRun.java b/eladmin-system/src/main/java/cn/ysk/cashier/AppRun.java index d65aa11a..5dcaa94a 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/AppRun.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/AppRun.java @@ -21,7 +21,6 @@ import cn.ysk.cashier.utils.SpringContextHolder; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.ApplicationPidFileWriter; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.scheduling.annotation.EnableAsync; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index db62464b..385919ea 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -121,7 +121,7 @@ public class TbProductServiceImpl implements TbProductService { tbProductVo.setUnitName(""); }else { for (TbShopUnit tbShopUnit : tbShopUnits) { - if(tbShopUnit.getId().toString().equals(product.getUnitId())){ + if(tbShopUnit.getId().equals(product.getUnitId())){ tbProductVo.setUnitName(tbShopUnit.getName()); } } @@ -142,7 +142,6 @@ public class TbProductServiceImpl implements TbProductService { BeanUtils.copyProperties(product, tbProductVo); tbProductVoList.add(tbProductVo); } - System.out.println(tbProductVoList); return PageUtil.toPage(tbProductVoList,page.getTotalElements()); }