Merge remote-tracking branch 'origin/master'

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/mapper/xml/HlgCompanySubcontractorMapper.xml

@@ -117,6 +117,7 @@
 		FROM hlg_company_subcontractor a
 		<include refid="hlgCompanySubcontractorJoins"/>
 		WHERE a.company_id = #{0}
+		group by a.id
 	</select>
 
 
@@ -126,6 +127,7 @@
 		FROM hlg_company_subcontractor a
 		<include refid="hlgCompanySubcontractorJoins"/>
 		WHERE a.company_id = #{hlgCompanySubcontractor.companyId}  and a.subcontractor_id = #{hlgCompanySubcontractor.subcontractorId}
+		group by a.id
 	</select>