diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerUserDao.java
deleted file mode 100644
index efd5cde8c0..0000000000
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerUserDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package com.epmet.dataaggre.dao.epmetuser;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dataaggre.entity.epmetuser.CustomerUserEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 居民用户信息,此表已作废
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-12-25
- */
-@Mapper
-public interface CustomerUserDao extends BaseDao {
-
-}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/CustomerUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/CustomerUserEntity.java
deleted file mode 100644
index bad1b5b830..0000000000
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/CustomerUserEntity.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package com.epmet.dataaggre.entity.epmetuser;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * 居民用户信息,此表已作废
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-12-25
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("customer_user")
-public class CustomerUserEntity extends BaseEpmetEntity {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 客户Id CUSTOMER.id
- */
- private String customerId;
-
- /**
- * 微信openId
- */
- private String wxOpenId;
-
- /**
- * 微信unionId
- */
- private String wxUnionId;
-
- /**
- * 手机号
- */
- private String mobile;
-
- /**
- * 昵称
- */
- private String nickname;
-
- /**
- * 性别:0.未知 1.男性2女性
- */
- private Integer sex;
-
- /**
- * 头像
- */
- private String headImgUrl;
-
- /**
- * 国家
- */
- private String country;
-
- /**
- * 省份
- */
- private String province;
-
- /**
- * 城市
- */
- private String city;
-
- /**
- * 语言
- */
- private String language;
-
-}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 7289670c7a..fbc82de26d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -502,17 +502,6 @@ public class IcResiUserController implements ResultDataResolver {
return new Result();
}
- @PostMapping("test")
- public Result>> test(@LoginUser TokenDto tokenDto, @RequestBody DynamicQueryFormDTO formDTO) {
- formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
- //formDTO.setCustomerId(tokenDto.getCustomerId());
- return new Result>>().ok(icResiUserService.dynamicQuery(formDTO.getCustomerId(),
- formDTO.getFormCode(),
- formDTO.getResultTableName(),
- formDTO.getConditions(),
- tokenDto.getUserId(), null));
- }
-
/**
* @param formDTO
* @Description 查询个人数据