Tree: df1865e667

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'df1865e667'

${ noResults }

Commit Graph

20754 Commits (df1865e6670a0c2573d06aaeb88bb4741d02c7b7)

 

All Branches   

Search

Author	SHA1	Message	Date
yinzuomei	5776367a2a	IcResiUserSubStatusEnum，新增01，导入02	4 years ago
yinzuomei	fa9c3e1747	SQL脚本	4 years ago
sunyuchao	57e59417cb	迁入管理 代码生成	4 years ago
zxc	84eae58ab0	字段修改	4 years ago
Jackwang	743ab8e307	迁出、福利、死亡人员相关	4 years ago
wangxianzhang	216fb26c86	居民信息模板变更。"居民基本信息录入表"sheet中的备注，挪动到了"基础信息"下	4 years ago
zxc	cd09ae214a	Merge branch 'dev_resi_export' into dev	4 years ago
zxc	b6e014f4a1	生成代码	4 years ago
zhangyuan	ee144b1b4a	增加身份证获取年龄的功能	4 years ago
zhangyuan	914414347c	福利等相关dto	4 years ago
YUJT	db5dc52c25	新增居民端党员风采接口	4 years ago
yinzuomei	8f844d27a4	Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of	4 years ago
yinzuomei	1fec754035	注释一下	4 years ago
zxc	188eff0e56	楼栋导入新增修改楼栋类型	4 years ago
zxc	f49151d476	去除多余判断	4 years ago
zhangyuan	4fabb54fb9	冗余代码	4 years ago
zxc	601c85057c	sort default 0	4 years ago
zxc	1366c8e0ac	小区导入bug修复	4 years ago
zxc	75bd0eb8bb	房屋导入微调	4 years ago
jianjun	6736ef1f1f	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into dev # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java	4 years ago
zhaoqifeng	86023faa67	个人信息	4 years ago
jianjun	14cbe024d9	合并冲突解决	4 years ago
jianjun	5a151ab746	Merge remote-tracking branch 'remotes/origin/back' into dev # Conflicts: # 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/service/IcResiUserService.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	4 years ago
jianjun	e88a9f13f1	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into dev # Conflicts: # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java	4 years ago
yinzuomei	f9bbcb5605	修改房屋，删除房屋缓存	4 years ago
zhaoqifeng	1459a2b36d	房屋管理左侧树排序	4 years ago
zxc	3575b1f2f9	sort	4 years ago
zhaoqifeng	f9d4b2c406	房屋管理左侧树排序	4 years ago
yinzuomei	9a82f4a645	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
yinzuomei	747ba74425	listresi排序调整1	4 years ago
jianjun	47daf2a736	Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export	4 years ago
jianjun	274212eca1	返回支持添加	4 years ago
zhaoqifeng	ac71a67c31	居民防疫信息排序	4 years ago
yinzuomei	bf48aef8b6	listresi排序调整	4 years ago
jianjun	47623547b2	返回支持添加	4 years ago
yinzuomei	51cb74e77f	信息采集详情	4 years ago
jianjun	f810d5f819	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
jianjun	59770de0cb	只合并改合并的	4 years ago
zxc	cd81ac7b6a	url	4 years ago
wangxianzhang	58093e0b03	Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export	4 years ago
wangxianzhang	7b9300be4c	居民信息导入的时候，对datapicker和datarange空间的内容进行正则解析判断，和格式转换	4 years ago
jianjun	95ace290f7	隐藏列原始值加密	4 years ago
jianjun	4303f3cc64	do语句被短路	4 years ago
jianjun	49d92147ad	添加设置列宽策略	4 years ago
zxc	c6b32326fd	楼栋，房屋列表新增倒序正序传参	4 years ago
zxc	1caf1b9244	楼栋，房屋列表新增倒序正序传参	4 years ago
jianjun	d4d995e2eb	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
jianjun	929aea9565	获取需求分类	4 years ago
zxc	eb9ce1cb89	楼栋修改	4 years ago
zxc	d036bad723	Merge branch 'dev_import_edit' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export Conflicts: epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	4 years ago