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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java

@@ -209,7 +209,7 @@
      }

   }



   private String getERCodeContent(TaoBaoGoodsBrief goods, String token) {

   public static String getERCodeContent(TaoBaoGoodsBrief goods, String token) {

      String content = String.format("【%s】%s元", goods.getUserType() == 1 ? "T猫价" : "T宝价",

            MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice()) + "");

      content += "\n\r";