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

admin

2020-06-22 225f534c32ade11d6b3ac5fd6dcc731e056935ec

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