Tree: e2817da49e

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'e2817da49e'

${ noResults }

Commit Graph

21079 Commits (e2817da49ebafe201c204514b4338b044e13a092)

 

All Branches   

Search

Author	SHA1	Message	Date
yinzuomei	e2817da49e	Merge remote-tracking branch 'origin/dev_0608fix' into dev_0608fix # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml	3 years ago
yinzuomei	19f6e548ef	房屋列表：remark	3 years ago
zxc	2e0263fa35	remark	3 years ago
zxc	085ba12372	emm	3 years ago
zxc	1e332de4fc	楼栋单元数修改	3 years ago
zxc	cc6333cc46	房屋信息增加新的查询条件	3 years ago
zhaoqifeng	aa1c85c2a2	Merge branch 'dev_party_mange'	3 years ago
zhaoqifeng	59709ee239	根据身份证判断居民在小程序端是否是志愿者	3 years ago
yinzuomei	468fc146c8	Merge remote-tracking branch 'origin/dev_zhili'	3 years ago
zhaoqifeng	85c48ee54b	根据身份证判断居民在小程序端是否是志愿者	3 years ago
yinzuomei	11ca6505d5	detail	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
wangxianzhang	9b5935ba7d	修改：客户初始化-初始化项目议题分类的listern，@Autowire注入属性的错误用法	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
HAHA	260fbe6201	修改字段，分页，统计数值	3 years ago
Jackwang	ebec56fea2	党组织树sql调整	3 years ago
Jackwang	4ae2b4ad67	branchList接口调整	3 years ago
HAHA	ee9b5f9e6c	改bug	3 years ago
sunyuchao	08bcfbfc08	。。。	3 years ago
sunyuchao	e72df9975f	。。。	3 years ago
Jackwang	3b5d697411	党组织树新增参数	3 years ago
sunyuchao	bc39b28708	。。。	3 years ago