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

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

 fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java

@@ -58,9 +58,6 @@
   @Resource

   private IntegralGetService integralGetService;

   

   @Resource(name = "producer")

   private Producer producer;

	


   private ExpressionParser parser = new SpelExpressionParser();