Merge branch 'dev'

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -385,7 +385,7 @@ public class CustomerStaffController {
      * @Date 11:09 2020-08-25
      **/
     @PostMapping(value = "staffbasicinfo")
-    public Result<BasicInfoResultDTO> staffBasicInfo(@LoginUser TokenDto tokenDTO){
+    public Result<StaffBasicInfoResultDTO> staffBasicInfo(@LoginUser TokenDto tokenDTO){
         return customerStaffService.selectStaffBasicInfo(tokenDTO.getUserId());
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java

@@ -189,7 +189,7 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
      * @Author zhangyong
      * @Date 10:07 2020-08-26
      **/
-	BasicInfoResultDTO selectStaffBasicInfo(@Param("userId") String userId);
+	StaffBasicInfoResultDTO selectStaffBasicInfo(@Param("userId") String userId);
 
 	/**
 	 * 根据staffId查询用户基本信息

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -305,7 +305,7 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @Author zhangyong
 	 * @Date 11:10 2020-08-25
 	 **/
-    Result<BasicInfoResultDTO> selectStaffBasicInfo(String userId);
+    Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId);
 
 	/**
 	 * @param  formDTO

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -650,9 +650,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	}
 
     @Override
-    public Result<BasicInfoResultDTO> selectStaffBasicInfo(String userId) {
-        BasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId);
-        return new Result<BasicInfoResultDTO>().ok(resultDTO);
+    public Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId) {
+		StaffBasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId);
+        return new Result<StaffBasicInfoResultDTO>().ok(resultDTO);
     }
 
 	/**

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -313,7 +313,7 @@
         LIMIT 1
     </select>
 
-    <select id="selectStaffBasicInfo" resultType="com.epmet.dto.result.BasicInfoResultDTO">
+    <select id="selectStaffBasicInfo" resultType="com.epmet.dto.result.StaffBasicInfoResultDTO">
         SELECT
             cs.CUSTOMER_ID customerId,
             cs.USER_ID id,