--no commit message

app/sysuser/src/main/java/com/zrqx/sysuser/fg/controller/propaganda/FgPropagandaColumnController.java

@@ -13,7 +13,7 @@ import com.zrqx.core.util.response.CallBack;
 import com.zrqx.sysuser.commons.form.fg.propaganda.FgQueryPropaganColumnForm;
 import com.zrqx.sysuser.commons.form.fg.propaganda.PropagandaForm;
 import com.zrqx.sysuser.commons.model.propaganda.PropagandaColumn;
-import com.zrqx.sysuser.commons.vo.fg.propaganda.FgPropagandaVo;
+import com.zrqx.sysuser.commons.model.propaganda.PropagandaContent;
 import com.zrqx.sysuser.fg.service.propaganda.FgPropagandaColumnService;
 
 import io.swagger.annotations.Api;
@@ -45,7 +45,7 @@ public class FgPropagandaColumnController {
 	
 	@ApiOperation(value = "根据栏目id查内容列表", notes = "根据栏目id查内容列表")
 	@GetMapping(value = "/page")
-	public CallBack<PageInfo<FgPropagandaVo>> page(PageParam pageParam,PropagandaForm form) {
+	public CallBack<PageInfo<PropagandaContent>> page(PageParam pageParam,PropagandaForm form) {
 		pageParam.setOrderBy("sort asc,createTime desc");
 		return CallBack.success(service.page(pageParam,form));  
 	}