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

admin

2020-04-01 c70caa91e6b0e1f944b148b55685aca43bb90783

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

@@ -48,4 +48,8 @@
    * @return

    */

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

	


   InviteOrderSubsidy selectByPrimaryKeyForUpdate(Long id);

	
}