Merge remote-tracking branch 'origin/master'

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java

@@ -274,6 +274,7 @@ public class UploadServiceImpl implements UploadService {
     @Override
     public Map selectPage(Integer pageNum, Integer pageSize) {
         Map map = new HashMap();
+        pageNum=pageNum-1;
         List<zxUserDto> shopZxList = shopZxMapper.selectPage(pageNum,pageSize);
         for (zxUserDto shopZx : shopZxList) {
             String zxUrl = shopZx.getZxUrl();

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UploadController.java

@@ -59,7 +59,7 @@ public class UploadController {
     }
 
     /**
-     * TODO 单图片文件上传
+     * TODO 用户头像上传
      *
      * @param request
      * @return