Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/resources/mapper/system/projectV2/XmProjectInvestorMapper.xml

@@ -30,7 +30,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="xmId != null "> and xm_id = #{xmId}</if>
             <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
-            <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
             <if test="companyAddress != null  and companyAddress != ''"> and company_address = #{companyAddress}</if>

ruoyi-system/src/main/resources/mapper/system/projectV2/XmProjectPersionMapper.xml

@@ -29,7 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="xmId != null "> and xm_id = #{xmId}</if>
             <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
-            <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>