Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzSbbzbServiceImpl.java

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/XmProjectPersionController.java

@@ -40,7 +40,7 @@ public class XmProjectPersionController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(XmProjectPersion xmProjectPersion)
     {
-        startPage();
+        //startPage();
         List<XmProjectPersion> list = xmProjectPersionService.selectXmProjectPersionList(xmProjectPersion);
         return getDataTable(list);
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/projectV2/XmProjectInvestorMapper.java

@@ -60,5 +60,5 @@ public interface XmProjectInvestorMapper
      */
     public int deleteXmProjectInvestorByIds(Long[] ids);
 
-    void updateXmProjectInvestorByXmbh(@Param("id") Long id, @Param("xmbh")String xmbh);
+    void updateXmProjectInvestorByXmbh(@Param("id") Long id,@Param("xmmc")String xmmc, @Param("xmbh")String xmbh);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/projectV2/XmProjectPersionMapper.java

@@ -60,5 +60,5 @@ public interface XmProjectPersionMapper
      */
     public int deleteXmProjectPersionByIds(Long[] ids);
 
-    void updateXmProjectPersionByXmbh(@Param("id") Long id, @Param("xmbh")String xmbh);
+    void updateXmProjectPersionByXmbh(@Param("id") Long id,@Param("xmmc")String xmmc, @Param("xmbh")String xmbh);
 }

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

@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
     <update id="updateXmProjectInvestorByXmbh">
-        update xm_project_investor set xm_id = #{id} where xmbh = #{xmbh}
+        update xm_project_investor set xm_id = #{id}, xmmc = #{xmmc} where xmbh = #{xmbh}
     </update>
 
     <delete id="deleteXmProjectInvestorById" parameterType="Long">

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

@@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <update id="updateXmProjectPersionByXmbh">
-        update xm_project_persion set xm_id = #{id} where xmbh = #{xmbh}
+        update xm_project_persion set xm_id = #{id}, xmmc=#{xmmc} where xmbh = #{xmbh}
     </update>
 
     <delete id="deleteXmProjectPersionById" parameterType="Long">