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

admin

2019-08-19 9c09cead959dbeef292628f345e5f80c30fc3d17

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

@@ -419,15 +419,15 @@
         

         case "recommendSearch":

            notify.put("name", "完成一次智能搜索");

            notify.put("score", "+20");

            notify.put("score", "+20金币");

            break;

         case "scanGoods":

            notify.put("name", "完成一次商品浏览");

            notify.put("score", "+10");

            notify.put("score", "+100金币");

            break;

         case "scanTBCart":

            notify.put("name", "完成一次购物车浏览");

            notify.put("score", "+30");

            notify.put("score", "+300金币");

            break;

         }