Merge branch 'feature/xgh/202503' into developer

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/SyncHaobanToGicApiServiceImpl.java

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/SyncHaobanToGicApiServiceImpl.java

@@ -29,10 +29,8 @@ public class SyncHaobanToGicApiServiceImpl implements SyncHaobanToGicApiService
 	@Override
 	public void delGicClerk(String gicClerkId) {
 		logger.info("【删除gicClerk】clerkID={}",gicClerkId);
-		ClerkDTO dto = this.clerkService.getClerkByClerkId(gicClerkId) ;
-		if(null != dto) {
-			powerService.delClerk(dto.getEnterpriseId(),null,gicClerkId,"10");
-		}
+		//clerkService.delClerk(gicClerkId);
+		this.clerkService.delClerkByHaoBan(gicClerkId) ;
 	}
 
 //	@Override