Merge remote-tracking branch 'origin/test' into test

src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java

@@ -391,9 +391,6 @@ public class ProductService {
         if (!CollectionUtils.isEmpty(products)) {
             products.parallelStream().forEach(it -> {
                 TbShopUnit tbShopUnit = unitMapper.selectByPrimaryKey(Integer.valueOf(it.getUnitId()));
-                if (it.getName().equals("烤牛肉")) {
-                    System.out.println("单位："+tbShopUnit.getName());
-                }
                 it.setUnitSnap(tbShopUnit != null ? tbShopUnit.getName() : "");
                 if(check){
                     List<TbProductGroup> tbProductGroups = tbProductGroupMapper.selectByProductId(it.getShopId(), it.getId().toString());