Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/resources/mapper/ActivityManageMapper.xml

@@ -49,7 +49,7 @@
         ) as visit_num,
 
         -- 分享新增用户
-        (select count(*) from ta_share_person_from f
+        (select count(DISTINCT f.person_id) from ta_share_person_from f
         where	f.org_id = a.org_id
         <choose>
             <when test=" type == 'live'">
@@ -65,7 +65,7 @@
         ) as new_persons,
 
         -- 分享新增客户
-        (select count(*) from ta_share_person_from g
+        (select count(DISTINCT g.person_id) from ta_share_person_from g
         inner join ta_person h on h.person_id = g.person_id
         where	g.org_id = a.org_id
         <choose>