Merge remote-tracking branch 'origin/dev/one' into dev/one

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -32,7 +32,7 @@ public interface UserMapper extends BaseMapper<User> {
     
     public Integer updateUserInfoAll(UserInfoOrganizationsVO userInfo);
     
-    public Integer updateDeleted(@Param("map") Map<String ,String> map);
+    public Integer updateDeleted(@Param("map") Map<String,Object> map);
 
     public List<User> getByIds(List<Long> ids);
 

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -29,7 +29,7 @@ public interface UserService extends IService<User> {
     
     public Integer updateUserInfoAll(UserInfoOrganizationsVO userInfo);
 
-	Integer updateDeleted(Map<String, String> map);
+	Integer updateDeleted(Map<String,Object> map);
 
     IPage<User> indexPage(Page<User> page, User user);
 

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -49,7 +49,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 		
 	}
 	@Override
-	public Integer updateDeleted(Map<String,String> map){
+	public Integer updateDeleted(Map<String,Object> map){
 		return baseMapper.updateDeleted(map);
 		
 	}

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -106,11 +106,11 @@ public class UserInfoController {
 	    @PostMapping("/updateDeleted")
 	    @SysLogger("updateDeleted")
 	    public RespDTO updateDeleted(@RequestParam String  userId){
-	    	Map<String,String> map = new HashMap<String, String>();
+	    	Map<String,Object> map = new HashMap<String, Object>();
 	    	map.put("userId", userId);
 	    	//TODO map.put("modifier",UserUtils.getCurrentPrincipleID());
 	    	map.put("modifier","5");
-	    	map.put("gmtModified",DateUtil.DATE_TIME_FORMAT);
+	    	map.put("gmtModified",DateUtil.now());
 	    	 int res= userFacade.updateDeleted(map);
 	    	 return RespDTO.onSuc("刪除成功"+res);
 	    }
@@ -208,8 +208,6 @@ public class UserInfoController {
 	    		 userOrganizationFacade.save(userOrganization);
 	    	 }
 	         
-	         
-	    	
 	    	 return RespDTO.onSuc("绑定成功");
 	    } 
 	    //TODO