|  yinzuomei | 5fc0420566 | Merge remote-tracking branch 'origin/develop' into release_temp | 4 years ago | 
				
					
						|  yinzuomei | 623de6e04f | Merge remote-tracking branch 'origin/dev_ic_v2' into develop | 4 years ago | 
				
					
						|  yinzuomei | 2f6a52def7 | 区域化党建单位满意度,四舍五入保留两位小数 | 4 years ago | 
				
					
						|  sunyuchao | e31b9c217f | Merge branch 'dev_ic_data' into develop | 4 years ago | 
				
					
						|  sunyuchao | 3cd249389b | Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data | 4 years ago | 
				
					
						|  sunyuchao | ffb4ce8b7a | 旧接口加返参 组织网格返经纬度 没值就取根组织的值 | 4 years ago | 
				
					
						|  zxc | 2748d1a126 | Merge remote-tracking branch 'origin/dev_ic_data' into develop | 4 years ago | 
				
					
						|  jianjun | 837eb8b617 | Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev | 4 years ago | 
				
					
						|  jianjun | 1bc26450be | 修改话题总数抽取逻辑bug,时间维度默认前一天;原来是默认空截止到了任务执行的时间了 导致数据比想要的要多 | 4 years ago | 
				
					
						|  zxc | e8768deb31 | 改了个颜色儿😡 | 4 years ago | 
				
					
						|  yinzuomei | a9aa2777dc | Merge remote-tracking branch 'origin/develop' into release_temp | 4 years ago | 
				
					
						|  yinzuomei | da9a3e8e83 | Merge remote-tracking branch 'origin/dev_ic_data' into develop | 4 years ago | 
				
					
						|  yinzuomei | e7131804f3 | Merge remote-tracking branch 'origin/dev_ic_v2' into develop # Conflicts:
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java | 4 years ago | 
				
					
						|  yinzuomei | df4262390c | Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data | 4 years ago | 
				
					
						|  yinzuomei | 11c3d11fb5 | Merge branches 'dev_ic_data' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_data  Conflicts:
	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java
	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java | 4 years ago | 
				
					
						|  sunyuchao | 355c80552e | colour改color 人才济济 掉头发 | 4 years ago | 
				
					
						|  yinzuomei | 8580a2c467 | 区域化党建单位满意度 | 4 years ago | 
				
					
						|  zhaoqifeng | c9bde02ec0 | Merge branch 'dev_ic_data' into develop | 4 years ago | 
				
					
						|  zxc | 38b16342c2 | remark | 4 years ago | 
				
					
						|  sunyuchao | a8dbd8a085 | Merge branch 'dev_ic_data' into develop | 4 years ago | 
				
					
						|  sunyuchao | 30e37af992 | Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data | 4 years ago | 
				
					
						|  sunyuchao | d97ffae9bc | 直属下级组织加经纬度 | 4 years ago | 
				
					
						|  yinzuomei | a1a70a2786 | Merge remote-tracking branch 'origin/develop' into release_temp | 4 years ago | 
				
					
						|  yinzuomei | 24e5b92d7d | Merge remote-tracking branch 'origin/dev_ic_data' into develop # Conflicts:
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 4 years ago | 
				
					
						|  yinzuomei | 1815be9515 | Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data | 4 years ago | 
				
					
						|  wangxianzhang | 6f806c407d | Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop | 4 years ago | 
				
					
						|  yinzuomei | 3a31907338 | Merge branches 'dev_ic_data' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_data  Conflicts:
	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java
	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
	epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
	epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml | 4 years ago | 
				
					
						|  wangxianzhang | d21721c227 | Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_data | 4 years ago | 
				
					
						|  wangxianzhang | 6dcbe3c023 | 新增: 1.志愿者坐标分布统计定时任务 | 4 years ago | 
				
					
						|  yinzuomei | 38c9211024 | Merge remote-tracking branch 'origin/dev_ic_v2' into develop # Conflicts:
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
#	epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml | 4 years ago | 
				
					
						|  yinzuomei | a1dc0941b6 | Merge remote-tracking branch 'origin/dev_ic_data' into develop | 4 years ago | 
				
					
						|  yinzuomei | 397b2c367f | Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data | 4 years ago | 
				
					
						|  yinzuomei | 4cbfd6f1a7 | wangle fuzhi | 4 years ago | 
				
					
						|  yinzuomei | 7908623213 | 区域化党建单位群众满意度 | 4 years ago | 
				
					
						|  sunyuchao | 6e4adcb198 | 组织下网格列表 | 4 years ago | 
				
					
						|  yinzuomei | 35fc328c2f | Merge remote-tracking branch 'origin/develop' into release_temp | 4 years ago | 
				
					
						|  zxc | 03181c0445 | Merge remote-tracking branch 'origin/develop' into develop | 4 years ago | 
				
					
						|  zxc | d75280f49e | Merge remote-tracking branch 'origin/dev_ic_data' into develop | 4 years ago | 
				
					
						|  yinzuomei | 81ff0f4893 | Merge remote-tracking branch 'origin/dev_ic_data' into develop | 4 years ago | 
				
					
						|  yinzuomei | 013283d7c9 | 需求研判分析返参调整 | 4 years ago | 
				
					
						|  yinzuomei | eb4e4df5e0 | 计算群众满意度 | 4 years ago | 
				
					
						|  wangxianzhang | bc326ca761 | Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop | 4 years ago | 
				
					
						|  wangxianzhang | 3333b47141 | Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data # Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 4 years ago | 
				
					
						|  wangxianzhang | 990031cbf0 | 新增: 1.志愿者坐标分布
2.志愿者信息简介 | 4 years ago | 
				
					
						|  yinzuomei | 8fcd4a2a72 | SystemMessageType.CAL_PARTY_UNIT_SATISFACTION | 4 years ago | 
				
					
						|  yinzuomei | cd43854e7b | SystemMessageType.CAL_PARTY_UNIT_SATISFACTION | 4 years ago | 
				
					
						|  yinzuomei | 87f1cbdd37 | cal_party_unit_satisfaction | 4 years ago | 
				
					
						|  yinzuomei | 4e7fc38f94 | CalPartyUnitSatisfactionFormDTO | 4 years ago | 
				
					
						|  jianjun | dbe0d7aef6 | Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev | 4 years ago | 
				
					
						|  jianjun | 7ac69991af | 之前改集成平台的东西 改了表名 fact_topic_issue_grid_daily 到时候看一下吧 | 4 years ago |