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

admin

2020-05-26 beef9055e75ec66abd95d642861e4aab74932a95

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/InviteOrderSubsidyMapper.java

@@ -51,7 +51,7 @@
   List<InviteOrderSubsidy> listByOrderNoAndType(@Param("orderNo") String orderNo, @Param("type") Integer type);



   List<InviteOrderSubsidy> listByOrderNoAndTypeAndUid(@Param("orderNo") String orderNo, @Param("type") Integer type,

         Long uid);

         @Param("uid")   Long uid);



   InviteOrderSubsidy selectByPrimaryKeyForUpdate(Long id);