java/zhihuishenqu.git

			@@ -11,6 +11,7 @@
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
			import com.panzhihua.common.model.dtos.grid.*;
			import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
			import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
			import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
			import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
			@@ -884,8 +885,9 @@
			* @param type 查看类型
			* @param streetId 街道id
			* @param areaCode 区县code
			* @param range */
			R userActivity(Integer type, Long streetId, Long areaCode, Integer range);
			* @param range
			* @param appId */
			R userActivity(Integer type, Long streetId, Long areaCode, Integer range, String appId);

			/**
			* 获取区县即下属街道名
			@@ -901,6 +903,14 @@
			R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);

			/**
			* 无水洗车通知推送
			* @param phone
			* @param orderStatus
			* @return
			*/
			R wsPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);

			/**
			* 获取城镇或村落列表
			* */
			R getCommunityList(String name,Long id);
			@@ -911,7 +921,7 @@
			* @param account
			* @return
			*/
			R resetPassword(Integer type,String account);
			R resetPassword(Integer type,String account,String appId);

			/**
			* 天府通办登录
			@@ -919,4 +929,13 @@
			* @return
			*/
			R tfLogin(UuLoginVO uuLoginVO);

			/**
			* 用户授权
			* @param userId
			* @return
			*/
			R accept(Long userId);

			R addComPbCheckUser(ComPbCheckUserDTO comPbCheckUserDTO);
			}