1.合并代码解决冲突

src/main/java/com/baosight/hggp/hg/wd/tools/HGWDTools.java

 package com.baosight.hggp.hg.wd.tools;
 
-import com.baosight.hggp.core.constant.CommonConstant;
-import com.baosight.hggp.core.constant.S3Constant;
 import com.baosight.hggp.core.dao.DaoBase;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.extapp.decheng.api.DcOpenApi;
 import com.baosight.hggp.core.security.UserSessionUtils;
-import com.baosight.hggp.hg.cw.constant.HgCwSqlConstant;
-import com.baosight.hggp.hg.cw.domain.HGCW009;
 import com.baosight.hggp.hg.cw.domain.HGCW999;
-import com.baosight.hggp.hg.dm.domain.HGDM099;
-import com.baosight.hggp.hg.pz.domain.HGPZ009;
-import com.baosight.hggp.hg.pz.tools.HGPZTools;
 import com.baosight.hggp.hg.wd.constant.HgWdSqlConstant;
 import com.baosight.hggp.hg.wd.domain.HGWD001;
 import com.baosight.hggp.hg.wd.domain.HGWD001A;
@@ -22,7 +15,6 @@ import com.baosight.hggp.hg.wd.domain.HGWD099;
 import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.MapUtils;
 import com.baosight.hggp.util.ObjectUtils;
-import com.baosight.iplat4j.core.ProjectInfo;
 import org.apache.commons.collections.CollectionUtils;
 
 import java.io.IOException;
@@ -300,7 +292,6 @@ public class HGWDTools {
 		
 	}
 	
-	
 	/**
 	 * 附件上传通知
 	 * @param hgwd001 待变更的项目名称