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

admin

2020-03-20 c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9

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

	
}