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

sop-business/src/main/java/com/qmth/sop/business/mapper/SysDingGroupMapper.java

@@ -24,5 +24,5 @@ public interface SysDingGroupMapper extends BaseMapper<SysDingGroup> {
 	 * @param iPage
 	 * @return
 	 */
-	public IPage<SysDingGroupResult> query(IPage<Map> iPage, @Param("serviceId") Long serviceId, @Param("status") ServiceStatusEnum status, @Param("supplierIds") Long[] supplierIds, @Param("query") Long[] dingRoleIds,@Param("approveRoleIds")  Long[] approveRoleIds, @Param("faceOpen") Boolean faceOpen,@Param("createStartTime")  Long createStartTime,@Param("createEndTime")  Long createEndTime);
+	public IPage<SysDingGroupResult> query(IPage<Map> iPage, @Param("serviceId") Long serviceId, @Param("status") ServiceStatusEnum status, @Param("supplierIds") Long[] supplierIds, @Param("dingRoleIds") Long[] dingRoleIds,@Param("approveRoleIds")  Long[] approveRoleIds, @Param("faceOpen") Boolean faceOpen,@Param("createStartTime")  Long createStartTime,@Param("createEndTime")  Long createEndTime);
 }