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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -730,10 +730,11 @@
         } else if (s > 0) {

            leftTime = s + "秒";

            leftTime = "还剩" + leftTime;

         } else {

            leftTime = "还剩0秒";

         }

      }

      json.put("leftTime", leftTime);

		
      if (!StringUtil.isNullOrEmpty(callback)) {

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(json)));

      } else {