zhaoqifeng
							
						 | 
						
							
							
							
								
							
								93cd73433a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								16b4d0fcd5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4b7ab53d2e
								
							
								
							
						 | 
						
							
							
								
								pa_customer表添加type字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a99daf737b
								
							
								
							
						 | 
						
							
							
								
								pa_customer表添加type字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								973c253b4b
								
							
								
							
						 | 
						
							
							
								
								新增:第三方平台模块相关代码修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fc38ce5d03
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5db91f665d
								
							
								
							
						 | 
						
							
							
								
								新增:第三方平台模块相关代码init
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2675f80290
								
							
								
							
						 | 
						
							
							
								
								pa_customer表添加type字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								882af3333e
								
							
								
							
						 | 
						
							
							
								
								/sso 根据地区码获取相关网格列表;获取用户最近访问的网格。
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								30e441f2c8
								
							
								
							
						 | 
						
							
							
								
								上传controller,service
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								dd2cdb15c2
								
							
								
							
						 | 
						
							
							
								
								district
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5a5dfe1f27
								
							
								
							
						 | 
						
							
							
								
								区直部门-治理能力修改end2
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4aded4d287
								
							
								
							
						 | 
						
							
							
								
								地区编码查询接口修改,服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								23153174f4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								436889cc47
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f6b40bb7bf
								
							
								
							
						 | 
						
							
							
								
								tree
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c396fc3377
								
							
								
							
						 | 
						
							
							
								
								jiedao
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								fa4688a0e6
								
							
								
							
						 | 
						
							
							
								
								入参修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								eb51561ef2
								
							
								
							
						 | 
						
							
							
								
								社区
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b99eac931b
								
							
								
							
						 | 
						
							
							
								
								区直部门-治理能力修改end1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5a7c25a69a
								
							
								
							
						 | 
						
							
							
								
								网格相关,分值计算修改end1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0a84c7e0f7
								
							
								
							
						 | 
						
							
							
								
								党员相关-党建能力分数计算修改end1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4ff8195339
								
							
								
							
						 | 
						
							
							
								
								指标计算入口,入参CalculateCommonFormDTO统一添加customerAreaCode、subCustomerIds: processPenddingCalculate
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								145d8073d5
								
							
								
							
						 | 
						
							
							
								
								指标计算入口,入参CalculateCommonFormDTO统一添加customerAreaCode、subCustomerIds
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5e1bdd35a3
								
							
								
							
						 | 
						
							
							
								
								五级指标表,新增分子、分母那些列改为decimal(14,6)
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f505885315
								
							
								
							
						 | 
						
							
							
								
								重发三个服务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dde4d387e9
								
							
								
							
						 | 
						
							
							
								
								五级指标表,新增分子、分母那些列默认值设0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fb07d8caa9
								
							
								
							
						 | 
						
							
							
								
								statis新增问题记录
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fba2fba3df
								
							
								
							
						 | 
						
							
							
								
								"代小程序管理"页面数据排序调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								be0110843b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c1c20ea005
								
							
								
							
						 | 
						
							
							
								
								dim_customer增加列area_code、screen_customer_agency/dept/grid增加列up_to_cal、新增customer_relation表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								99939d86f7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1c6f8620a9
								
							
								
							
						 | 
						
							
							
								
								"代小程序管理"页面数据排序调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5c5d610f38
								
							
								
							
						 | 
						
							
							
								
								dimCustomer初始化添加areaCode
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8b6aec63ae
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_areaCode
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								41cdefec8f
								
							
								
							
						 | 
						
							
							
								
								open-api+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1e87036c6f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3e4fe9463a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_voice_scan' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a39762b14f
								
							
								
							
						 | 
						
							
							
								
								#bug1831:工作端-党员审核bug 发布resi-party,user
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								45684fbef4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e3ea5b86b7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_reg_party_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								61dd8c4146
								
							
								
							
						 | 
						
							
							
								
								发短信方法调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a2d27378c5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6ba59779bc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_mess_party' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1708336fa2
								
							
								
							
						 | 
						
							
							
								
								短信发送
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								24e998fc07
								
							
								
							
						 | 
						
							
							
								
								修复:pom->prod环境的active错误的配置成了test
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								73f4cc75cd
								
							
								
							
						 | 
						
							
							
								
								订阅消息、身边党员、短信功能发布生产
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4292c5a573
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7e6f5e2c28
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_mess_party' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								730b892023
								
							
								
							
						 | 
						
							
							
								
								注册党员的bug修复①数据之间有依赖,调整逻辑执行的顺序,先生成用户缓存数据,再根据缓存里的注册网格Id进行初始化党员徽章②在检查用户是否是认证居民时,主表使用的baseInfo,左关联resiInfo,当baseInfo有值而resiInfo为空时会查出数据,被认为已经注册居民,但是此时用户并未生成注册居民的一系列数据,用户触发更新微信信息的接口时会初始化上baseInfo,改成内关联,只有当两边都有值时才能认定用户已经注册。
							
							
							
							
								
							
							
						 | 
						5 years ago |