Tree: fbf39e3864

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'fbf39e3864'

${ noResults }

Commit Graph

13802 Commits (fbf39e386497cb5d24f443f2512be51f744d22d6)

 

All Branches   

Search

Author	SHA1	Message	Date
yinzuomei	de569d0a99	Merge remote-tracking branch 'origin/dev_ic_platform' into develop	4 years ago
yinzuomei	738d0025b0	分页列表查询，增加staffId，查询当前工作人员所属组织及下级	4 years ago
yinzuomei	ba404ef495	Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform	4 years ago
yinzuomei	ca1490649e	分页列表查询，增加staffId，查询当前工作人员所属组织及下级	4 years ago
zxc	0f41c247a3	Merge remote-tracking branch 'origin/dev_ic_platform' into develop	4 years ago
zxc	777aa9e0c0	查询房屋信息	4 years ago
zxc	daba90da7b	Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform	4 years ago
zxc	71b4875446	查询房屋信息	4 years ago
sunyuchao	73eb1c002d	居民信息新增 对必填参数进行校验	4 years ago
jianjun	b265f5646c	Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop	4 years ago
jianjun	b7b3015875	Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform	4 years ago
jianjun	2a5259c861	去掉经济低保字段	4 years ago
wangxianzhang	47039c9ab3	Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform	4 years ago
jianjun	1b4f1de003	Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop	4 years ago
jianjun	eb2a4822e2	Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform	4 years ago
jianjun	0f6ad0d77c	去掉经济低保字段	4 years ago
wangxianzhang	7b42d87947	Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform Conflicts: epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	4 years ago
zxc	08e951199f	暂存	4 years ago
wangxianzhang	9c6a66c8d7	完成居民基础信息导入	4 years ago
jianjun	ed8cde38bb	Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop	4 years ago
lzh	a9b7d4760b	neighbourHoodId 改neighborHoodId	4 years ago
jianjun	f8bea6ae44	居民信息模版	4 years ago
wangxianzhang	9818971f0d	冲突处理	4 years ago
wangxianzhang	d818f5e36a	Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform Conflicts: epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	4 years ago
wangxianzhang	54867de8e3	修改： 导入居民基本信息完善，已经可以读取中文并且转换成db所需的数据，下一步，转换成sql，并且测试数据的完整性	4 years ago
jianjun	a90f86a50b	Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	4 years ago
jianjun	6ab79e6c52	导出 居民信息	4 years ago
wangxianzhang	34eaf42c2b	Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform Conflicts: epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java	4 years ago
wangxianzhang	d2deb8cbf5	修改： 导入居民基本信息完善	4 years ago
zhaoqifeng	a0359c6c73	Merge branch 'dev_ic_platform' into develop	4 years ago
zhaoqifeng	4f3bcda0a6	房屋下拉框修改	4 years ago
lzh	1be87cef4c	小区管理 列表 模糊查询，楼宇单元列表排序	4 years ago
zxc	5fe1ea51fb	名字修改	4 years ago
zhaoqifeng	06d03e4c9d	Merge branch 'dev_ic_platform' into develop	4 years ago
zhaoqifeng	ce12486ff6	小区下拉框查询修改	4 years ago
sunyuchao	e16e266407	对外网格员巡查数据程序调整	4 years ago
jianjun	2232128a4f	Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop	4 years ago
jianjun	249caedb55	导出 暂存	4 years ago
yinzuomei	4155550ea5	test1	4 years ago
yinzuomei	b17456e34c	Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform # 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
yinzuomei	5a397acffa	test	4 years ago
wangxianzhang	3c9abd0757	Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform	4 years ago
wangxianzhang	9621b23663	增加： 导入excel居民信息（未完成）	4 years ago
yinzuomei	7d1de06cab	Merge remote-tracking branch 'origin/dev_ic_platform' into develop	4 years ago
yinzuomei	9ace9a94c6	注释掉原来的方法，后面删除	4 years ago
yinzuomei	186959fcb6	Merge remote-tracking branch 'origin/dev_ic_platform' into develop	4 years ago
yinzuomei	a9157b6fb9	Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform	4 years ago
yinzuomei	b07b3c6d08	删掉居民	4 years ago
zxc	45f79b3c5a	Merge remote-tracking branch 'origin/dev_ic_platform' into develop	4 years ago
zxc	01b45edda2	【基础信息】家庭 左侧楼栋查询	4 years ago