Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/domain/business/AssoGroupFeature.java

@@ -16,6 +16,8 @@ public class AssoGroupFeature  extends BaseEntity<AssoGroupFeature> {
     //特征id
     @TableField(value = "feature_id")
     private Integer featureId;
+    @TableField(exist = false)
+    private String featureText;
     //特征id
     @TableField(value = "feature_pre_id")
     private Integer featurePreId;

src/main/java/cn/cslg/pas/domain/business/ProofGroup.java

@@ -135,4 +135,7 @@ public class ProofGroup extends BaseEntity<ProofGroup> {
 
     @TableField(value = "project_id")
     private Integer projectId;
+    @TableField(value = "description2")
+    private String description2;
+
 }