!317 修复合并错误

Merge pull request !317 from 德仔/develop
This commit is contained in:
德仔
2021-07-14 10:27:20 +00:00
committed by Gitee

View File

@ -778,11 +778,12 @@ public class WechatAppletController extends BaseController {
}
}
return AjaxResult.success(result);
}*/
}
/**
* 查询打卡社区
*
* @return
*/
@GetMapping("/getCommunityPunch")
@ -801,6 +802,7 @@ public class WechatAppletController extends BaseController {
/**
* 修改健康减脂宣言
*
* @return
*/
@PostMapping("/updateHealthManifesto")
@ -823,6 +825,7 @@ public class WechatAppletController extends BaseController {
/**
* 获取个人中心数据(健康宣言、消息条数、打卡社区总打卡次数、打卡次数)
*
* @return
*/
@GetMapping("/getCustomerCenterInfo")
@ -857,6 +860,7 @@ public class WechatAppletController extends BaseController {
/**
* 获取需要在小程序展示的Banner图
*
* @return
*/
@GetMapping("/getShowBannerImage")