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

admin

2019-09-04 25941582a2c5c731b0ce413fa40f5495a1e8f0c2

 fanli/src/main/java/com/yeshi/fanli/util/annotation/integral/IntegralGetFrequencyLimit.java

@@ -19,4 +19,7 @@
@Retention(RetentionPolicy.RUNTIME)

public @interface IntegralGetFrequencyLimit {

   String key();



   // 时间 （s）默认时间为1800s

   int time() default 30 * 60;

}