wangchao
							
						 | 
						
							
							
							
								
							
								913ec56185
								
							
								
							
						 | 
						
							
							
								
								更新用户最近访问时,同事更新latestTime和updatedTime两个字段
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								bd556f1ef5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								933df5a0ef
								
							
								
							
						 | 
						
							
							
								
								接口名称修改,getlatesttentopics改成getlatesttopics,错误信息封装常量
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								17e88bf785
								
							
								
							
						 | 
						
							
							
								
								居民端-添加热心居民申请审核接口
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								daa0689f26
								
							
								
							
						 | 
						
							
							
								
								添加 消息相关
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6882ae4ef0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								59195ae17a
								
							
								
							
						 | 
						
							
							
								
								上传图片接口
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								dd41e5ea8d
								
							
								
							
						 | 
						
							
							
								
								居民端-居民注册信息提交程序优化
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5a3078b656
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								06764ee33f
								
							
								
							
						 | 
						
							
							
								
								居民端-居民注册获取手机验证码
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								ed32b4d246
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								d7bc75c8ab
								
							
								
							
						 | 
						
							
							
								
								话题相关、评论相关增加FormDTO
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a0e42049b4
								
							
								
							
						 | 
						
							
							
								
								我的小组sql修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								eb3c481b0c
								
							
								
							
						 | 
						
							
							
								
								发送端新feign添加@PathVariable
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								34740ac429
								
							
								
							
						 | 
						
							
							
								
								加入小组界面初始化接口修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cf47e97204
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								52d9334daf
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7a8510ffc8
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								4eea403e3a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-message/epmet-message-server/pom.xml 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								dcd471f510
								
							
								
							
						 | 
						
							
							
								
								更改参数注解
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								35d3c4393a
								
							
								
							
						 | 
						
							
							
								
								message的pom文件加上<activation>
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								264816ac21
								
							
								
							
						 | 
						
							
							
								
								messagepom修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								df9d7706e5
								
							
								
							
						 | 
						
							
							
								
								opercrm误提
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5f51e472e3
								
							
								
							
						 | 
						
							
							
								
								messagepom文件修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								49d5487046
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								fdd17936fa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2d170e97b1
								
							
								
							
						 | 
						
							
							
								
								EpmetErrorCode修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								41e54b06a2
								
							
								
							
						 | 
						
							
							
								
								屏蔽话题修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a4e8dd826a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c78d249769
								
							
								
							
						 | 
						
							
							
								
								短信验证码修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d88bb0baca
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								78b719f93c
								
							
								
							
						 | 
						
							
							
								
								message修改devnacos配置
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1fb32bba5a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								005f6465fb
								
							
								
							
						 | 
						
							
							
								
								党员认证获取短信验证码
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7fb3a8bad0
								
							
								
							
						 | 
						
							
							
								
								我的小组groupLeaderFlag修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								635435461b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9af74f7e28
								
							
								
							
						 | 
						
							
							
								
								居民端-居民注册添加短信验证码服务
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7bfa9812c5
								
							
								
							
						 | 
						
							
							
								
								修复:MessageFeignClient缺少@PathVariable注解
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b3eb5fc271
								
							
								
							
						 | 
						
							
							
								
								居民端-居民注册、热心申请模块insert语句修改 使用系统insert方法
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ccab39a11d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								98e7b6aa2f
								
							
								
							
						 | 
						
							
							
								
								修改:短信验证码接口,改为url传参。提供短信验证码接口的feign client
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								hosinokamui
							
						 | 
						
							
							
							
								
							
								cb5aae62ae
								
							
								
							
						 | 
						
							
							
								
								修改 认证成功后添加角色
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f285ae6fc5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								91948ce28c
								
							
								
							
						 | 
						
							
							
								
								修改:将message-server模块的feign client挪到了message-client模块
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f18e1be322
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								a059aa4ed7
								
							
								
							
						 | 
						
							
							
								
								话题、评论接口修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								hosinokamui
							
						 | 
						
							
							
							
								
							
								3e89fb4b56
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								hosinokamui
							
						 | 
						
							
							
							
								
							
								a5c5026085
								
							
								
							
						 | 
						
							
							
								
								修改 党员认证提交
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0470ded8c6
								
							
								
							
						 | 
						
							
							
								
								居民端-居民注册信息提交入参修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bb35320ee0
								
							
								
							
						 | 
						
							
							
								
								新增:短信验证码接口
							
							
							
							
							
							
								
							
							
							修改:/message/sms/send接口,由表单形式修改为json形式 
							
						 | 
						6 years ago |