Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

 igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java

@@ -19,7 +19,7 @@
import com.ld.igds.util.DateUtil;

/**
 * 
 *
 * @author: andy.jia
 * @description:
 * @version:
@@ -34,7 +34,7 @@
      if (null == parameter) {
         parameter = new HashMap<String, Object>();
      }
		

      Map<String, Object> args = new HashMap<String, Object>();

      // 默认获取6个月的数据信息
@@ -65,7 +65,7 @@
      }

      String countHql = "select count(*) " + hql;
      hql += " order by batchId desc";
      hql += " order by receiveDate desc";

      this.pagingQuery(page, hql, countHql, args);
   }