Merge remote-tracking branch 'origin/master'

Alan

2021-02-19 7e172d1de04d55caafd86489fa81c06c142adab2

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.java

@@ -32,7 +32,7 @@
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE badId IN \n" +
            " WHERE closeId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +