Merge branch 'dev_wx_msg' into dev_temp

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -263,6 +263,6 @@ public class StaffServiceImpl implements StaffService {
 	 */
 	@Override
 	public Result<BasicInfoResultDTO> staffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
-		return epmetUserOpenFeignClient.staffBasicInfo(fromDTO);
+		return epmetUserOpenFeignClient.getStaffBasicInfo(fromDTO);
 	}
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -332,6 +332,6 @@ public interface EpmetUserOpenFeignClient {
      * 根据staffId查询用户基本信息
      * @author sun
      */
-    @PostMapping("/epmetuser/customerstaff/staffbasicinfo")
+    @PostMapping("/epmetuser/customerstaff/getstaffbasicinfo")
-    Result<BasicInfoResultDTO> staffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO);
+    Result<BasicInfoResultDTO> getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -222,7 +222,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result<BasicInfoResultDTO> staffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
+    public Result<BasicInfoResultDTO> getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "staffBasicInfo", fromDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO);
     }
 }

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

@@ -405,9 +405,9 @@ public class CustomerStaffController {
      * 根据staffId查询用户基本信息
      * @author sun
      */
-    @PostMapping("staffbasicinfo")
+    @PostMapping("getstaffbasicinfo")
-    public Result<BasicInfoResultDTO> staffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO){
+    public Result<BasicInfoResultDTO> getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO){
-        return new Result<BasicInfoResultDTO>().ok(customerStaffService.staffBasicInfo(fromDTO));
+        return new Result<BasicInfoResultDTO>().ok(customerStaffService.getStaffBasicInfo(fromDTO));
     }
 
 }

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

@@ -320,5 +320,5 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @author sun
 	 * @return
 	 */
-	BasicInfoResultDTO staffBasicInfo(StaffBasicInfoFromDTO fromDTO);
+	BasicInfoResultDTO getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO);
 }

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

@@ -673,7 +673,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	 * @return
 	 */
 	@Override
-	public BasicInfoResultDTO staffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
+	public BasicInfoResultDTO getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
 		return baseDao.getStaffBasicInfo(fromDTO);
 	}