yinzuomei
							
						 | 
						
							
							
							
								
							
								f7f6d23865
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice' into dev_voice
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c7baee6f29
								
							
								
							
						 | 
						
							
							
								
								政府端:选中草稿编辑,获取草稿属性
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0cfb04b5dc
								
							
								
							
						 | 
						
							
							
								
								党建声音-政府端-下线文章接口首次提交
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a382475e43
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0080a253a8
								
							
								
							
						 | 
						
							
							
								
								政府端:选中草稿编辑,获取草稿属性
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ab0cf5328c
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e182488ae9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice' into dev_voice
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ae1b0ee5f2
								
							
								
							
						 | 
						
							
							
								
								编辑草稿获取草稿文章内容、获取草稿文章属性
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9fd01f5559
								
							
								
							
						 | 
						
							
							
								
								1.epmet-user-client中提供FeignClient
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bece7ca2cb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice' into dev_voice
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								50330344da
								
							
								
							
						 | 
						
							
							
								
								feign地址
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								09972733d2
								
							
								
							
						 | 
						
							
							
								
								政府端已发布列表页-获取关联标签
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4954e6b2d4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice' into dev_voice
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
#	epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								37734c52c2
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								962c235ba8
								
							
								
							
						 | 
						
							
							
								
								冲突解决
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f3a0ab064a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice' into dev_voice
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								186572a69f
								
							
								
							
						 | 
						
							
							
								
								删除草稿、文章操作记录列表、政府端查看已下线、已发布文章详情
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e474fa2df3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								927c9431c0
								
							
								
							
						 | 
						
							
							
								
								1.权限模块获取登陆用户信息逻辑改动
							
							
							
							
							
							
								
							
							
							2.commons模块清理部分对gov-access的引用 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d0ff40e699
								
							
								
							
						 | 
						
							
							
								
								1.版本升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								62226f7b8b
								
							
								
							
						 | 
						
							
							
								
								1.gov-access删除无效接口
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5f7215306b
								
							
								
							
						 | 
						
							
							
								
								保存文章内容接口
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a662e8107d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								880c67067f
								
							
								
							
						 | 
						
							
							
								
								文章发布范围关系表添加 网格名称
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								14da6aa703
								
							
								
							
						 | 
						
							
							
								
								1.补充提交
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f9af919f22
								
							
								
							
						 | 
						
							
							
								
								1.版本升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f620060f0b
								
							
								
							
						 | 
						
							
							
								
								1.将查询LoginUserDetails接口从gov-access移到了epmet-user服务
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								6d4fd28de6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0a2ed77683
								
							
								
							
						 | 
						
							
							
								
								居民端已发布列表页的标签
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ddcbe527ea
								
							
								
							
						 | 
						
							
							
								
								党建声音-政府端-可选发布单位接口首次提交
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ed20715ca9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice' into dev_voice
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								448dbf7b3a
								
							
								
							
						 | 
						
							
							
								
								初始化脚本 修改publisherType类型;
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3d076e5cd1
								
							
								
							
						 | 
						
							
							
								
								1.版本升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								71b2ee3a2b
								
							
								
							
						 | 
						
							
							
								
								1.修复:geteway中取customerId的逻辑漏洞
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d3c982088f
								
							
								
							
						 | 
						
							
							
								
								初始化脚本 修改publisherType类型;保存内容接口暂存
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								090d642cb6
								
							
								
							
						 | 
						
							
							
								
								党建声音-政府端-可选发布范围接口首次提交
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ad400cc3e5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								794267cfda
								
							
								
							
						 | 
						
							
							
								
								政府端已发布列表页的标签
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ebbb5c6691
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								73365ff513
								
							
								
							
						 | 
						
							
							
								
								1.版本升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								255c6b1ba8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								01ef8496dc
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								40f09ffa4f
								
							
								
							
						 | 
						
							
							
								
								1.版本升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ff56818878
								
							
								
							
						 | 
						
							
							
								
								1.在请求header中加了customer,通过@LoginUser TokenDto获取
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								12505173ec
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c670f85cbd
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								190a6cc940
								
							
								
							
						 | 
						
							
							
								
								1.版本升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7d836102f3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								08c3d5f3d9
								
							
								
							
						 | 
						
							
							
								
								居民端查看话题详情时,如果话题已关闭,显示关闭的详情。
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b90b0e8aa1
								
							
								
							
						 | 
						
							
							
								
								gov-voice服务代码生成
							
							
							
							
								
							
							
						 | 
						6 years ago |