jianjun
							
						 | 
						
							
							
							
								
							
								2ab5a8d3ba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								33c2391798
								
							
								
							
						 | 
						
							
							
								
								oss删除文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bb2238013c
								
							
								
							
						 | 
						
							
							
								
								返回文件名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								456e63b954
								
							
								
							
						 | 
						
							
							
								
								可胜任组长-组员列表(工作端通用)
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								74bbe6258b
								
							
								
							
						 | 
						
							
							
								
								小组成员删除
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c67d86d16d
								
							
								
							
						 | 
						
							
							
								
								删除党建声音文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2c9b55b402
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_voice_attachment' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c0ec3f3a36
								
							
								
							
						 | 
						
							
							
								
								返回文件名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								98806364b4
								
							
								
							
						 | 
						
							
							
								
								修复:jwt过期之后,取过期时间为空,造成的空指针问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2506cff2fa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-gateway/src/main/resources/bootstrap.yml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6be68765de
								
							
								
							
						 | 
						
							
							
								
								返回文件名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								342935e782
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4845bf3f03
								
							
								
							
						 | 
						
							
							
								
								文章内容 如果为文件 则校验文件名不能为空
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ecf0811b67
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b135bda98a
								
							
								
							
						 | 
						
							
							
								
								转让组接口v2
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								98af8a04be
								
							
								
							
						 | 
						
							
							
								
								评价周期内被吹哨且被办结的项目数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2a20d01b90
								
							
								
							
						 | 
						
							
							
								
								转让组接口v1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								50a2792505
								
							
								
							
						 | 
						
							
							
								
								查找群主:resi_group_member.GROUP_LEADER_FLAG = 'leader'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b272ae5afa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4183d436df
								
							
								
							
						 | 
						
							
							
								
								文章内容 如果为文件 则校验文件名不能为空
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c6897da76a
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_group0329' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group0329
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bb9ecd664e
								
							
								
							
						 | 
						
							
							
								
								转让组接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6dea3eeff5
								
							
								
							
						 | 
						
							
							
								
								话题评论列表添加条件and `STATUS`='discussing'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ca227ad968
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6b6f0ce092
								
							
								
							
						 | 
						
							
							
								
								文章详情返回filename
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								410bdb054d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								83c152008f
								
							
								
							
						 | 
						
							
							
								
								oss返回domain域名用于替换
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								539bc2694b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_issue_category' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								c589a9d00e
								
							
								
							
						 | 
						
							
							
								
								议题项目分类字典表,根据id+customerId联合主键修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								cd22ec47cb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_gateway_extauth' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								40fb288fc0
								
							
								
							
						 | 
						
							
							
								
								修复:对外开放api,没有认证即可访问接口的bug
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8ce822ed99
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ea7e91a022
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_group0329' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group0329
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f14d04ba77
								
							
								
							
						 | 
						
							
							
								
								大概是睡着了吧
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								306d979b44
								
							
								
							
						 | 
						
							
							
								
								项目分类初始化调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								02d5a0c7cf
								
							
								
							
						 | 
						
							
							
								
								修复:access token有效期配置de单位错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d2f9bdd5cc
								
							
								
							
						 | 
						
							
							
								
								ossController
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								88728eddda
								
							
								
							
						 | 
						
							
							
								
								自动生成代码提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a21ebfb4a7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_jyztc' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								833e4836a2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_yzm' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e110eda305
								
							
								
							
						 | 
						
							
							
								
								党建声音-内容添加Pdf字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5ba2a90b36
								
							
								
							
						 | 
						
							
							
								
								党建声音-内容添加Pdf字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ca33b77bfe
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_jyztc' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1fb901c1a7
								
							
								
							
						 | 
						
							
							
								
								ext新增api:获取当前客户下工作端角色列表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								73d3928664
								
							
								
							
						 | 
						
							
							
								
								党建声音-上传Pdf
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								751b00539e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_issue_category' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								af6daf48af
								
							
								
							
						 | 
						
							
							
								
								解决运营端新增分类 小程序查询不到标签问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5a764820f0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_318_wangc' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								77aeed3fbc
								
							
								
							
						 | 
						
							
							
								
								代码微调
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ab548dc7e8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_yzm' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago |