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

yujian

2020-05-14 6cb04a3c75f46001a55be402c6650d5600748dc7

 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);