Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG002A.java

@@ -52,7 +52,7 @@ public class ServiceHGCG002A extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
 			EiInfoUtils.addBlock(inInfo,"userByCompany", HGXSTools.XsUser.listAll(UserSessionUtils.getAccountCode()), User.class);
 			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
-			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG001A().eiMetadata);
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG001().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
@@ -73,7 +73,7 @@ public class ServiceHGCG002A extends ServiceBase {
 			HGCGUtils.HgCg001.setCondition(queryRow);
 			// 仅审核通过
 			queryRow.put(HGCG001.FIELD_STATUS, HGConstant.CgPlanStatus.S_2);
-			inInfo = super.query(inInfo, HGCG001A.QUERY, new HGCG001A());
+			inInfo = super.query(inInfo, HGCG001.QUERY, new HGCG001A());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}