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

admin

2020-06-29 48934b8c3da5a6791d0805ff0c1d327da834cc2d

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

@@ -7,7 +7,11 @@
   taobaoTaoke("淘客api"),

   taobaoTrade("淘宝交易（分享/自购）"),

   taobaoAuth("淘宝授权"),

   userLogin("用户登录");

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

   userLogin("用户登录"),

	
   ;

	


   private String desc;