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

admin

2020-05-14 e673aef27f779e1ebc016e0e38455561dd39253c

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java

@@ -242,7 +242,7 @@
         

         Integer scanNum = pushGoods.getScanNum();

         if (scanNum == null) {

            vo.setScanNum("0");

//            vo.setScanNum("0");

         } else if (scanNum >= 10000) {

            double num = scanNum;

            String numMidea = String.format("%.1f", num / 10000);