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

admin

2020-05-14 235921d820f29b04b1e82f6a6f0d4a1957a900ef

 fanli/src/main/java/com/yeshi/fanli/log/LogType.java

@@ -8,7 +8,10 @@
   taobaoTrade("淘宝交易（分享/自购）"),

   taobaoAuth("淘宝授权"),

   taobaoGoods("淘宝商品信息"),

   userLogin("用户登录");

   userLogin("用户登录"),

	
   ;

	


   private String desc;