--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/pc/articlelibrary/Pc_FgArticleLibraryController.java

@@ -3,14 +3,13 @@ package com.zrqx.resource.fg.controller.pc.articlelibrary;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.zrqx.core.constant.resource.ResourceRequestPath;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.util.response.CallBack;
-import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryOneVO;
+import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryOneVO;
 import com.zrqx.resource.fg.service.articlelibrary.FgArticleLibraryService;
 
 import io.swagger.annotations.Api;
@@ -29,11 +28,11 @@ public class Pc_FgArticleLibraryController {
 
 	@ApiOperation(value = "查询", notes = "根据ID查询")
 	@GetMapping(value = "/get/oid")
-	public CallBack<ArticleLibraryOneVO> getById(String oid) {
+	public CallBack<FgArticleLibraryOneVO> getById(String oid) {
 		ArticleLibrary entity = service.selectByPrimaryKey(oid);
 		entity.setBrowseNum(entity.getBrowseNum()+1);
 		service.updateByPrimaryKey(entity);
-		ArticleLibraryOneVO vo = new ArticleLibraryOneVO();
+		FgArticleLibraryOneVO vo = new FgArticleLibraryOneVO();
 		BeanUtils.copyProperties(entity, vo);
 		return CallBack.success(vo);
 	}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/articlelibrary/FgArticleLibraryMapper.java

@@ -80,10 +80,10 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 			+ " where 1=1 and a.status = 1 "
 			
 			+ "<if test = 'form.diyTypeCode != null' >"  
-			+ " and ad.code like concat('%', #{form.diyTypeCode},'%'))"
+			+ " and ad.code like concat('%', #{form.diyTypeCode},'%')"
 			+ "</if>"
 			+ "<if test = 'form.keywords != null' >"  
-		    + " and a.name like concat('%',#{form.keywords},'%'))"
+		    + " and a.name like concat('%',#{form.keywords},'%')"
 		    + "</if>"
 		    + "</script>")
 	List<FgSearchListVO> pc_page(@Param("form")Pc_FgQueryForm form);