Merge remote-tracking branch 'origin/master'

admin

2019-03-01 237794cca5d458376a9de0f3590ea850d45e2499

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -1988,7 +1988,7 @@
         

         if (from != null && from.equals("miandan")) {

            // 免单商品

            hongBao = quanPrice.toString();

            hongBao = "¥" + quanPrice.toString();

         }