HAHA
							
						 | 
						
							
							
							
								
							
								9b0e939ad7
								
							
								
							
						 | 
						
							
							
								
								新增排序字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d1f90696dd
								
							
								
							
						 | 
						
							
							
								
								添加排序规则
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								a3e2c8c2a0
								
							
								
							
						 | 
						
							
							
								
								修改flyway脚本
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								8e986aee24
								
							
								
							
						 | 
						
							
							
								
								建表flyway
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								9e952026e5
								
							
								
							
						 | 
						
							
							
								
								update
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								5bbcc61fc9
								
							
								
							
						 | 
						
							
							
								
								优化代码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								40243292b7
								
							
								
							
						 | 
						
							
							
								
								调整代码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								2708d4f17d
								
							
								
							
						 | 
						
							
							
								
								更新flyway脚本
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								a1b2b4928f
								
							
								
							
						 | 
						
							
							
								
								存储数据定时任务
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								390c9a83b4
								
							
								
							
						 | 
						
							
							
								
								修改查询为模糊查询
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								1c70f609af
								
							
								
							
						 | 
						
							
							
								
								修改语句
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								11b9970b5f
								
							
								
							
						 | 
						
							
							
								
								配置定时任务
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								1eecfcee1d
								
							
								
							
						 | 
						
							
							
								
								修改调用ruoyi逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								9f3b9805a0
								
							
								
							
						 | 
						
							
							
								
								get和set
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d3f249a21a
								
							
								
							
						 | 
						
							
							
								
								流动人口详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								652d998373
								
							
								
							
						 | 
						
							
							
								
								人口基本信息详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								331ce25868
								
							
								
							
						 | 
						
							
							
								
								出租房条件查询和详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								eaf057aecc
								
							
								
							
						 | 
						
							
							
								
								平房条件查询和详情接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								1b43bf529d
								
							
								
							
						 | 
						
							
							
								
								楼栋的条件查询和详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								14c330e2eb
								
							
								
							
						 | 
						
							
							
								
								流动人口调用ruoyi接口存储数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								7137426cfa
								
							
								
							
						 | 
						
							
							
								
								人口基本信息调用ruoyi接口存储数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								89f164c9d0
								
							
								
							
						 | 
						
							
							
								
								出租房调用ruoyi接口存储数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								4b4857f849
								
							
								
							
						 | 
						
							
							
								
								平房调用ruoyi接口存储数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								3e780435d5
								
							
								
							
						 | 
						
							
							
								
								楼栋调用ruoyi接口存储数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d6052e66c0
								
							
								
							
						 | 
						
							
							
								
								楼栋基本信息详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								4e444ad84f
								
							
								
							
						 | 
						
							
							
								
								各种分页接口以及补充注释
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								e380c42342
								
							
								
							
						 | 
						
							
							
								
								出租房信息分页接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								22b6ecc167
								
							
								
							
						 | 
						
							
							
								
								平房分页接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								76fc621b46
								
							
								
							
						 | 
						
							
							
								
								分页接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								6860ef2fd8
								
							
								
							
						 | 
						
							
							
								
								分页接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								96a1ee758d
								
							
								
							
						 | 
						
							
							
								
								分页接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								35c2d917cd
								
							
								
							
						 | 
						
							
							
								
								修改生成代码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								3cbb8349fc
								
							
								
							
						 | 
						
							
							
								
								代码生成
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2053cd7eb0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_party_mange'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								77fc8e3e24
								
							
								
							
						 | 
						
							
							
								
								党员相关bug修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d6b5fb9766
								
							
								
							
						 | 
						
							
							
								
								更新flyaway,删除经纬度逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								f20dcaa5f5
								
							
								
							
						 | 
						
							
							
								
								删除IcVolunteerPolyCategory表经纬度
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								73c382d6b7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_party_mange'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								a66304cb76
								
							
								
							
						 | 
						
							
							
								
								编辑注释
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7a426a491e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_party_mange'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								c5ce744a15
								
							
								
							
						 | 
						
							
							
								
								饼图枚举类
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								ec3f9fa678
								
							
								
							
						 | 
						
							
							
								
								新增一级党组织bug修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4c11923f2e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_party_mange'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
#	epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
#	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/service/IcPartyUnitService.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
#	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
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.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/IcResiUserImportServiceImpl.java
#	epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								37c819b738
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_zhili'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	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
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								be88e66eaa
								
							
								
							
						 | 
						
							
							
								
								党员相关bug修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								02cc325bf2
								
							
								
							
						 | 
						
							
							
								
								修改所属支部级联菜单接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7b79f69120
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								63e25776e8
								
							
								
							
						 | 
						
							
							
								
								党员相关bug修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								ff6dec398f
								
							
								
							
						 | 
						
							
							
								
								经纬度
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								e05cd75d09
								
							
								
							
						 | 
						
							
							
								
								支部党组织接口调整
							
							
							
							
								
							
							
						 | 
						3 years ago |