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

yujian

2020-05-23 dd6a31aae79b35ccf0e006704a4d9e1d950c57d6

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java

@@ -58,8 +58,8 @@
   }



   @Override

   public List<UserShareGoodsGroup> listByRecordId(Long recordId) {

      return userShareGoodsGroupMapper.listByRecordId(recordId);

   public List<UserShareGoodsGroup> listByRecordId(Long recordId, boolean notBackSuVip) {

      return userShareGoodsGroupMapper.listByRecordId(recordId, notBackSuVip);

   }



   @Override