Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
112ca9f848
|
@ -114,7 +114,7 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{
|
||||||
@ApiImplicitParam(name = "id", value = "编号", required =true,paramType="query")
|
@ApiImplicitParam(name = "id", value = "编号", required =true,paramType="query")
|
||||||
@GetMapping("/get")
|
@GetMapping("/get")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public ResultData get(@ModelAttribute @ApiIgnore ContentBean content,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model){
|
public ResultData get(@ModelAttribute @ApiIgnore ContentEntity content,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model){
|
||||||
if(content.getId()==null) {
|
if(content.getId()==null) {
|
||||||
return ResultData.build().error();
|
return ResultData.build().error();
|
||||||
}
|
}
|
||||||
|
|
|
@ -156,7 +156,7 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!--根据实体获取-->
|
<!--根据实体获取-->
|
||||||
<select id="getByEntity" resultMap="resultMap" parameterType="net.mingsoft.cms.bean.ContentBean">
|
<select id="getByEntity" resultMap="resultMap" parameterType="net.mingsoft.cms.entity.ContentEntity">
|
||||||
select * from cms_content
|
select * from cms_content
|
||||||
<where>
|
<where>
|
||||||
del=0
|
del=0
|
||||||
|
|
Loading…
Reference in New Issue