Merge branch 'div'

yujian

2019-02-28 f39b8e15df0c267e8a5b6135ab4ee44766acb7cd

Merge branch 'div'

 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();

            }