Merge remote-tracking branch 'origin/hph' into dev

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserShopMsgMapper.java

@@ -6,16 +6,18 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 @Mapper
 public interface TbUserShopMsgMapper {
-    int deleteByPrimaryKey(Integer shopId);
+    int deleteByPrimaryKey(Integer id);
 
     int insert(TbUserShopMsg record);
 
     int insertSelective(TbUserShopMsg record);
 
-    TbUserShopMsg selectByPrimaryKey(Integer shopId);
+    TbUserShopMsg selectByPrimaryKey(Integer id);
 
     int updateByPrimaryKeySelective(TbUserShopMsg record);
 
@@ -23,4 +25,7 @@ public interface TbUserShopMsgMapper {
 
     @Select("select * from tb_user_shop_msg where shop_id=#{shopId}")
     TbUserShopMsg selectByShopId(@Param("shopId") String shopId);
-}
+
+
+    List<TbUserShopMsg> selectAllByShopId(@Param("shopId") Integer shopId);
+}