Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/resources/mapper/SysDingGroupMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.qmth.sop.business.mapper.SysDingGroupMapper">
 
     <select id="query" resultType="com.qmth.sop.business.bean.result.SysDingGroupResult">
-        select a.*,s.name supplier,t.name service,u.real_name create_name,t.status from sys_ding_group a
+        select DISTINCT a.*,s.name supplier,t.name service,u.real_name create_name,t.status from sys_ding_group a
         left join sys_user u on u.id = a.create_id
         left join sys_supplier s on s.id = a.supplier_id
         left join t_b_service t on t.id = a.service_id