制造冲突

src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java

@@ -22,7 +22,7 @@ import java.util.Set;
  **/
 @Mapper
 public interface CashCollectionMapper {
-
+    //ceshi
     //根据jwcode获取所属地区
     String getMarketByJwcode(@Param("jwcode") Integer jwcode);
     //新增收款订单

src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java

@@ -34,6 +34,6 @@ public interface CashRefundMapper {
     //获取各阶段审核人
     LhlAudit getAudit(Integer id);
     List<CashRecordDTO> exSelect(CashRecordDTO cashRecordDTO);
-
+    //获取审核人
     List<LhlAudit> getAuditBatch(Set<Integer> auditIds);
 }

src/main/java/com/example/demo/mapper/coin/AuditMapper.java

@@ -49,6 +49,6 @@ public interface AuditMapper {
     String getName(Integer auditId);
     //更新首充日期
     void updateFirstRecharge(Integer jwcode);
-
+    //获取审核人id对应人名
     List<Admin> getNamesByIds(Set<Integer> submitterIds);
 }

src/main/java/com/example/demo/mapper/coin/MarketMapper.java

@@ -18,5 +18,6 @@ public interface MarketMapper {
     Market getMarketIdDao(String  country);
     Market getMarketIdBytype(String  market);
     String getMarketById(String  market);
+    //获取市场id
         List<Market> getMarketByIds(@Param("marketIds") Set<Integer> marketIds);
 }

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -255,6 +255,7 @@
         left join recharge_activity ra on ra.id = cr.activity
         where cr.id=#{id}
     </select>
+    <!--根据id查询收款订单-->
     <select id="selectBatchIds" resultType="com.example.demo.domain.vo.cash.CashCollection">
         select
         cr.id, cr.jwcode, cr.name, cr.market,

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -381,7 +381,7 @@
             </otherwise>
         </choose>
     </select>
-
+    <!-- 批量获取审核人信息 -->
     <select id="getAuditBatch" resultType="com.example.demo.domain.vo.cash.LhlAudit">
         SELECT *
         FROM lhl_audit

src/main/resources/mapper/AuditMapper.xml

@@ -168,7 +168,7 @@
     <select id="getName" resultType="java.lang.String">
         select admin_name from admin where id = #{auditId}
     </select>
-
+        <!-- 获取审核人id对应人名 -->
         <select id="getNamesByIds" resultType="com.example.demo.domain.entity.Admin">
             select id, admin_name from admin
             where id in

src/main/resources/mapper/MarketMapper.xml

@@ -38,6 +38,7 @@
     <select id="getMarketById" resultType="java.lang.String">
         select name from market where id=#{market}
     </select>
+    <!-- 根据ID列表查询市场名称 -->
     <select id="getMarketByIds" resultType="com.example.demo.domain.entity.Market">
         select id, name from market
         where 1 = 0