Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复合并错误

Browse Source
This commit is contained in:
huangdeliang
2021-07-14 18:25:57 +08:00
parent ab291f3032
commit 7059bc998b
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
View File

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