Tree: 4b173f4fb1

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '4b173f4fb1'

${ noResults }

Commit Graph

21139 Commits (4b173f4fb155bb8c341c8f4538a48662c7ab9817)

 

All Branches   

Search

Author	SHA1	Message	Date
zhangyuan	76dbe9aecd	无日期查询当日	3 years ago
wangxianzhang	6ff124cd4a	【居民信息导入】AGENCY_ID应该取所属网格的上级，而不是从当前登录人员的agencyId中取	3 years ago
zhangyuan	985b257a17	bug	3 years ago
jianjun	2053cd7eb0	Merge remote-tracking branch 'remotes/origin/dev_party_mange'	3 years ago
zhangyuan	5d842bacc6	完善页面查询	3 years ago
zhangyuan	b783eb4b01	修改统计逻辑	3 years ago
zhaoqifeng	77fc8e3e24	党员相关bug修改	3 years ago
zhangyuan	c3ec06ec2c	网格判断del=0	3 years ago
HAHA	d6b5fb9766	更新flyaway，删除经纬度逻辑	3 years ago
HAHA	f20dcaa5f5	删除IcVolunteerPolyCategory表经纬度	3 years ago
zhangyuan	43bcadeffc	dim表筛选数据	3 years ago
jianjun	73c382d6b7	Merge remote-tracking branch 'remotes/origin/dev_party_mange'	3 years ago
zhangyuan	c88dc8873f	灵活统计	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
zhangyuan	2024ff0127	sql bug	3 years ago
zhaoqifeng	be88e66eaa	党员相关bug修改	3 years ago
zhangyuan	81b678fa03	组织ID取其他表	3 years ago
zhangyuan	25b3240fd9	dateId	3 years ago
zhangyuan	335f2298cf	指定customer表名	3 years ago
YUJT	02cc325bf2	修改所属支部级联菜单接口	3 years ago
zhangyuan	106bf78ee6	组织统计时删除历史数据	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
zhangyuan	1eb6329295	增加历史数据删除功能	3 years ago
zhangyuan	8aa442d839	缺失字段	3 years ago
zhangyuan	751d1099be	检测gridId而非agency	3 years ago
zhangyuan	0347a88abc	统计网格信息	3 years ago
Jackwang	e05cd75d09	支部党组织接口调整	3 years ago
wangxianzhang	9b5935ba7d	修改：客户初始化-初始化项目议题分类的listern，@Autowire注入属性的错误用法	3 years ago
zhangyuan	1d18a2482c	grid和agency数据统计中	3 years ago
zhaoqifeng	2ec47cbdd7	Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange	3 years ago
Jackwang	b7cf287575	获取用户志愿者标识调整	3 years ago
zhaoqifeng	c09656809b	党员所属支部两边存储格式修改	3 years ago
zhaoqifeng	a5c9222770	党员所属支部两边存储格式修改	3 years ago
HAHA	1acf8a96bb	修改统计逻辑	3 years ago
HAHA	d0e6f50ee7	查询条件	3 years ago
HAHA	e7db65be08	饼图	3 years ago
HAHA	4cd9258577	饼图	3 years ago
zhaoqifeng	0ade16d689	党员只能建在支部上，志愿者抽取逻辑修改	3 years ago
HAHA	bdbcc02f55	增加查询字段	3 years ago
Jackwang	fcf20b2695	Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange	3 years ago
Jackwang	d2892ba276	党员接口新增字段	3 years ago
HAHA	201c641e9e	排错	3 years ago
zhangyuan	aea3236ee3	完善网格和组织查询方式	3 years ago