Merge remote-tracking branch 'origin/master'

luoyb

2021-02-21 3c41f5a06d386ffe40ead600b4053df6237ba3ad

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java

@@ -60,6 +60,9 @@
         queryWrapper.between(EmpRemarkInfo::getRemarkDate, empRemarkinfo.getRemarkDateStr().split(",")[0],
               empRemarkinfo.getRemarkDateStr().split(",")[1]);
      }
      if (StringUtils.isNotBlank(empRemarkinfo.getRemarkContent())) {
         queryWrapper.like(EmpRemarkInfo::getRemarkContent, empRemarkinfo.getRemarkContent());
      }
        Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }