Merge remote-tracking branch 'origin/master'

Alan

2021-02-21 67aafeb142cf9af2a5dbcd1d17a450f31e2751b3

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

@@ -74,6 +74,9 @@
      if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
         queryWrapper.eq(EmpLaborTrouble::getEmpStatus, empLabortrouble.getEmpStatus());
      }
      if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
         queryWrapper.like(EmpLaborTrouble::getArbitrationReason, empLabortrouble.getArbitrationReason());
      }
        Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }