Merge branch 'ww' into test

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProductGroup.java

@@ -3,7 +3,6 @@ package com.chaozhanggui.system.cashierservice.entity;
 
 import org.springframework.data.annotation.Transient;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 

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

@@ -161,8 +161,8 @@ public class ProductService {
                     g.setProducts(new ArrayList<>());
                 }
             });
+            groupList.sort(Comparator.comparingInt(TbProductGroup::getIsSale).reversed());
             groupList.add(0, hot);
-            groupList.sort(Comparator.comparingInt(TbProductGroup::getIsSale));
             concurrentMap.put("productInfo", groupList);
         }
 

src/main/resources/mapper/TbShopUserFlowMapper.xml

@@ -130,6 +130,7 @@
 
     SELECT
     f.*,
+    u.`head_img`,
     u.`name`
     FROM
     tb_shop_user_flow f