Merge remote-tracking branch 'origin/system_fee' into system_fee

mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -219,7 +219,7 @@
                 AND e.job_nature_ = #{jobNature}
             </if>
             <if test="search != null">
-                AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
+                AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%') or su.id_ like CONCAT('%',#{search},'%'))
             </if>
         </where>
         ORDER BY e.create_time_ DESC <include refid="global.limit"/>) ue