解决代码冲突

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java

@@ -94,7 +94,6 @@ public class ScreenCustomerAgencyEntity extends BaseEpmetEntity {
 	 * 行政地区编码
 	 */
 	private String areaCode;
-	private String code;
 	private String sourceType;
 
 	/**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java

@@ -93,6 +93,4 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity {
 	 * desc: 是否参与上级计算yes:参与;no:不参与 add 01.14
 	 */
 	private String upToCal;
-
-	private String code;
 }