Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-06-29 651dfb24aa82ea28e6348907bc02dc8c84a6e13f

 igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java

@@ -30,8 +30,9 @@

            String str = (String) param.get("depotId");
            if (StringUtils.isNotEmpty(str)) {
                hql += " and depotId =:depotId";
                args.put("depotId", str);
                hql += " and depotIdIn =:depotIdIn or depotIdOut =:depotIdOut";
                args.put("depotIdIn", str);
                args.put("depotIdOut", str);
            }

        }
@@ -106,7 +107,7 @@
            args.put("startTime", DateUtil.getCurZero(date));
            args.put("endTime", DateUtil.getNextZero(date));
        }
        hql += " order by  updateTime desc";
        hql += " order by  updateTime desc limit 20";
        return this.query(hql, args);
    }