Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!319

adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java

@@ -50,6 +50,10 @@ public class FileMaterial extends BaseEntity {
     @TableField("attach_file_id")
     private String attachFileId;
 
+    @ApiModelProperty(value = "资料说明")
+    @TableField("data_explain")
+    private String  dataExplain;
+
 
     @ApiModelProperty(value = "点击量")
     @TableField("click_count")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java

@@ -36,6 +36,8 @@ public class SarModelTree extends BaseEntity {
     @TableField("PID")
     private String pid;
 
+
+    @ApiModelProperty(value = "查询子节点时,使用model与结果对比,筛选出与父节点不同的数据")
     @TableField("MODEL")
     private String model;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java

@@ -23,7 +23,7 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
 
     List<SarStandardsInfo> getSarStandardsInfoPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark);
 
-    int getSarStandardsInfoCount(SarStandardsInfoEOPage page);
+    int getSarStandardsInfoCount(@Param("page") SarStandardsInfoEOPage page);
 
     int getSarStandardsInfoCountWk1(SarStandardsInfoEOPage page);