冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java

@@ -130,4 +130,10 @@
    */

   public List<HongBaoV2> listChildrenById(Long id);



   /**

    * 最近30天内产生过分享订单的用户

    * @return

    */

   public List<Long> getUidByNear30DayShareSucceed();



}