Merge remote-tracking branch 'origin/master'

admin

2019-04-16 930c8623600677e2bbfcf54087ec29295621657f

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

@@ -184,7 +184,7 @@
         String platform = acceptData.getPlatform();

         if ("android".equalsIgnoreCase(platform) && tversion > 38) {

            changePicture = true;

         } else if (tversion > 45){

         } else if (tversion > 47){

            changePicture = true;

         }