Merge remote-tracking branch 'origin/dev' into test

yun-zuoyi
jenkins 6 years ago
commit 1d4d25d1c2

@ -56,7 +56,7 @@ public class SysMessageController extends CoreBaseController {
@PostMapping(value = "/sys-message/insert") @PostMapping(value = "/sys-message/insert")
@ApiOperation(value = "新增消息",notes = "新增消息") @ApiOperation(value = "新增消息",notes = "新增消息")
public ResultBean<SysMessage> insertSysMessage(@RequestBody SysMessage sysMessage){ public ResultBean<SysMessage> insertSysMessage(SysMessage sysMessage){
try { try {
// 条件校验 // 条件校验
ValidatorBean.beginValid(sysMessage) ValidatorBean.beginValid(sysMessage)
@ -163,7 +163,7 @@ public class SysMessageController extends CoreBaseController {
} }
} }
@GetMapping(value = "/sys-message/query") @PostMapping(value = "/sys-message/query")
@ApiOperation(value = "消息复杂查询,分页,排序",notes = "消息复杂查询,分页,排序") @ApiOperation(value = "消息复杂查询,分页,排序",notes = "消息复杂查询,分页,排序")
public ResultBean<SysMessage> querySysMessageByPager(@RequestBody MessagePagerModel messagePagerModel){ public ResultBean<SysMessage> querySysMessageByPager(@RequestBody MessagePagerModel messagePagerModel){
try { try {
@ -343,7 +343,12 @@ public class SysMessageController extends CoreBaseController {
} }
} }
@GetMapping(value = "/user-message/query") /**
*
* @param refUserMessagePagerModel
* @return
*/
@PostMapping(value = "/user-message/query")
@ApiOperation(value = "消息复杂查询,分页,排序",notes = "消息复杂查询,分页,排序") @ApiOperation(value = "消息复杂查询,分页,排序",notes = "消息复杂查询,分页,排序")
public ResultBean<SysRefUserMessage> querySysRefUserMessageByPager(@RequestBody RefUserMessagePagerModel refUserMessagePagerModel){ public ResultBean<SysRefUserMessage> querySysRefUserMessageByPager(@RequestBody RefUserMessagePagerModel refUserMessagePagerModel){
try { try {

Loading…
Cancel
Save