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

admin

2020-07-01 5a37edc8cb5e4fb62e374d55b504843d2f5a4a6c

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponRecordMapper.java

@@ -25,7 +25,7 @@
    * @param listCouponId

    * @return

    */

   UserSystemCouponRecord getRecordByOrderNo(@Param("orderNo") String orderNo, @Param("state") Integer state);

   UserSystemCouponRecord getRecordByOrderNo(@Param("orderNo") String orderNo, @Param("source")Integer source, @Param("state") Integer state);

   

   

   /**