zhaoqifeng
							
						 | 
						
							
							
							
								
							
								81ec30d0c8
								
							
								
							
						 | 
						
							
							
								
								小组议题-全部议题修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9b92449d62
								
							
								
							
						 | 
						
							
							
								
								bug修改,关于历史小组数据首次生成小组海报报错的问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								a31083a567
								
							
								
							
						 | 
						
							
							
								
								当议题申请第一次被拒绝后,第二次申请之前将议题开关关闭,二次申请后生成的两条申请历史1、under_auditing 2、auto_passed先后之间的createdTime要相差一秒,保证议题审核历史列表排序的正确性
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								289f8d1336
								
							
								
							
						 | 
						
							
							
								
								审核历史倒叙
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								97f449250f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_code' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b5764f292f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_issue_audit' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								19d5220088
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								d88c2d2a36
								
							
								
							
						 | 
						
							
							
								
								上传代码时,更新小程序名
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								3a419e3b9d
								
							
								
							
						 | 
						
							
							
								
								判断条件修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								3548817eb4
								
							
								
							
						 | 
						
							
							
								
								驳回后被屏蔽、关闭的话题不能再转为议题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								1999f35158
								
							
								
							
						 | 
						
							
							
								
								处于【待审核】状态转议题的话题都不可屏蔽、关闭
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b4fc3afa73
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								296f196678
								
							
								
							
						 | 
						
							
							
								
								1、网格长审核议题后给话题发起人发送站内信2、工作端applicationDetail接口显示的话题发表人和议题发起人的昵称显示修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5c99074050
								
							
								
							
						 | 
						
							
							
								
								新增邀请或扫码入组方法,旧方法不能兼容,增加v2.0接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6eb62542c5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_govaccess_async' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								07d99b2910
								
							
								
							
						 | 
						
							
							
								
								修复:【权限初始化器】修复可能出现的空指针问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8d4b42aef0
								
							
								
							
						 | 
						
							
							
								
								新增:【权限初始化器】做了针对opeName和brief的修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								eb06ce39a0
								
							
								
							
						 | 
						
							
							
								
								邀请入组的接口添加返参,标识是否存在审核中申请
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2e2e57053f
								
							
								
							
						 | 
						
							
							
								
								我参与的议题-修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bdfb510ab7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_govaccess_async' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7fbd0fd3f5
								
							
								
							
						 | 
						
							
							
								
								修复:【批量给角色添加操作权限和范围】增加删除缓存角色现有的操作
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								927f2d159a
								
							
								
							
						 | 
						
							
							
								
								查看入群待审核列表SQL修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9c2b5fcf04
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3bfdefff64
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_personal_center' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								63cafbb86b
								
							
								
							
						 | 
						
							
							
								
								邀请入组程序调整兼容旧程序
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4356b96e07
								
							
								
							
						 | 
						
							
							
								
								区分不同进组方式
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								851c9687b9
								
							
								
							
						 | 
						
							
							
								
								我参与的议题-修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								0aef44d2d9
								
							
								
							
						 | 
						
							
							
								
								我参与的议题-修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								c34c320940
								
							
								
							
						 | 
						
							
							
								
								认证徽章时,在从未提交过认证信息时,默认将用户基础信息(姓、名、身份证号、手机号)带出
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c0eca257d7
								
							
								
							
						 | 
						
							
							
								
								我参与的议题-修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ad62ec98c7
								
							
								
							
						 | 
						
							
							
								
								我参与的议题-修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								890a7ebbb6
								
							
								
							
						 | 
						
							
							
								
								我参与的议题-修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								358a16b9cc
								
							
								
							
						 | 
						
							
							
								
								修改:【我创建的话题列表】优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								0c0f18b533
								
							
								
							
						 | 
						
							
							
								
								我参与的议题-修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								62f019c942
								
							
								
							
						 | 
						
							
							
								
								个人信息修改-添加昵称修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4df79724ef
								
							
								
							
						 | 
						
							
							
								
								账号安全 获取手机号不返回null
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								cc24b33fa1
								
							
								
							
						 | 
						
							
							
								
								修复:我创建的话题列表,网格id为空的空指针错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5e1eb99678
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_personal_center' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								03e2a65a3e
								
							
								
							
						 | 
						
							
							
								
								热心居民认证时,刷新该用户所在所有组缓存的热心居民数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								5bfa0689ee
								
							
								
							
						 | 
						
							
							
								
								取消或点亮徽章时强一致性
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								ee74b9c0af
								
							
								
							
						 | 
						
							
							
								
								取消或点亮徽章时强一致性
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c9e729b7ab
								
							
								
							
						 | 
						
							
							
								
								测试获取请求域名端口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								1abe8d3419
								
							
								
							
						 | 
						
							
							
								
								queryGroupProcessingCount空指针问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								cd9d601771
								
							
								
							
						 | 
						
							
							
								
								话题转移提兼容原有接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8bb2df597a
								
							
								
							
						 | 
						
							
							
								
								修复:HttpContextutils.getRequestServerNameAndPort()支持从nginx获取X-Forwarded-Scheme头
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								692aede971
								
							
								
							
						 | 
						
							
							
								
								修改:测试请求信息的方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								cba96c4487
								
							
								
							
						 | 
						
							
							
								
								修复:【提交小组信息编辑】,修复只有党员身份无法编辑小组的问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								295e82fee6
								
							
								
							
						 | 
						
							
							
								
								修复了议题审核开关关闭时的问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cc9e2c2981
								
							
								
							
						 | 
						
							
							
								
								issue_customer_parameter 默认audit_switch开关是关闭
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b6d24aab05
								
							
								
							
						 | 
						
							
							
								
								修复:【我创建的话题(已转议题)】接口,没有查询到项目的情况下空指针异常
							
							
							
							
								
							
							
						 | 
						5 years ago |