Merge remote-tracking branch 'origin/master'

src/main/java/net/mingsoft/cms/action/web/ContentAction.java

@@ -114,7 +114,7 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{
     @ApiImplicitParam(name = "id", value = "编号", required =true,paramType="query")
 	@GetMapping("/get")
 	@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) {
 			return ResultData.build().error();
 		}

src/main/java/net/mingsoft/cms/dao/IContentDao.xml

@@ -156,7 +156,7 @@
 		</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
 			<where>
 				del=0