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

admin

2020-02-28 1d9eef9a4ba7caebf73b483e0062f9259dbf22a0

 fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java

@@ -39,7 +39,7 @@
      orderTaoBao("淘宝订单"),

      coollect("收藏"),

      scanHistory("足迹"),

      team("队员"),

      team("粉丝"),

      kefu("联系客服"),

      taoBaoShoppingCart("淘宝购物车"),

      orderFind("订单申诉"),