resolve conflict

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -1268,7 +1268,8 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             pool.setSourceFrom(requestVO.getSourceFrom());
             pool.setSourceFrom(requestVO.getSourceFrom());
             pool.setIsActive(1);
             pool.setIsActive(1);
             pool.setAddedAt(new Date());
             pool.setAddedAt(new Date());
-            pool.setAddedBy(-1L);
+            pool.setAddedBy(requestVO.getAssignedPractitionerId());
+            pool.setAdderType(2);
             mktLeadsPoolDALService.save(pool);
             mktLeadsPoolDALService.save(pool);
         }
         }
         //保存至指派表
         //保存至指派表

yd-api/src/main/java/com/yd/dal/entity/marketing/MktLeadsPool.java

@@ -52,4 +52,6 @@ public class MktLeadsPool {
     * 建置者 FK ag_acl_user.id
     * 建置者 FK ag_acl_user.id
     */
     */
     private Long addedBy;
     private Long addedBy;
+
+    private Integer adderType;
 }
 }
\ No newline at end of file

yd-api/src/main/resources/mapper/marketing/MktLeadsPoolMapper.xml

@@ -70,6 +70,9 @@
       <if test="addedBy != null">
       <if test="addedBy != null">
         added_by,
         added_by,
       </if>
       </if>
+      <if test="adderType != null">
+        adder_type,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="customerId != null">
       <if test="customerId != null">
@@ -96,6 +99,9 @@
       <if test="addedBy != null">
       <if test="addedBy != null">
         #{addedBy,jdbcType=BIGINT},
         #{addedBy,jdbcType=BIGINT},
       </if>
       </if>
+       <if test="adderType != null">
+        #{adderType,jdbcType=BIGINT},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.marketing.MktLeadsPool">
   <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.marketing.MktLeadsPool">