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

admin

2020-02-23 b8134c0133956c67cd94fb4efa036238df2cbe2e

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

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

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

   taobaoAuth("淘宝授权"),

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

   userLogin("用户登录");



   private String desc;