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

yujian

2020-06-01 824d003d330a25b1f5b1e9ed30e4ad868868c2ab

 fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopUtil.java

@@ -54,7 +54,7 @@


   public static String getTypeFromChanTag(String tag) {

      String decodeTag = StringUtil.getFromBase64(tag);

      return decodeTag.split("#")[1];

      return decodeTag.split("#")[0];

   }



   public static BigDecimal getGoodsFanLiMoney(VIPGoodsInfo goods, BigDecimal rate) {