我的学习按资料名类型查询

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcStudy.java

@@ -27,6 +27,8 @@ public class CmcStudy extends BaseEntity
     @Excel(name = "学习资料标题")
     private String title;
     private CmcResource resource;
+    @Excel(name = "学习资料类型")
+    private String type;
 
     /** 用户id */
     private Long userId;
@@ -88,6 +90,24 @@ public class CmcStudy extends BaseEntity
     {
         return lastPoint;
     }
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
     public void setLastTime(Date lastTime) 
     {
         this.lastTime = lastTime;
@@ -109,7 +129,6 @@ public class CmcStudy extends BaseEntity
     public void setResource(CmcResource resource)
     {
         this.resource = resource;
-        this.title = resource == null ? "" : resource.getTitle();
     }
 
     public CmcResource getResource()