Tree: 51cb74e77f

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '51cb74e77f'

${ noResults }

Commit Graph

18579 Commits (51cb74e77f73b9dbdab1200f410a7afd51f4c70e)

 

All Branches   

Search

Author	SHA1	Message	Date
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
zxc	8a81223eb6	模板修改	4 years ago
zhaoqifeng	0c17491316	个人档案-家庭关系bug修改	4 years ago
yinzuomei	705ba77687	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
yinzuomei	7d2af1fb1d	居民信息列表导出增加ic_resi_user.id desc	4 years ago
zxc	ae6746dbdd	楼栋导出添加 楼长信息，新增修改sort接口	4 years ago
wangxianzhang	27a9f00ab0	=60岁的也是老年人	4 years ago
zxc	c7adc6c71e	导入修改	4 years ago
zxc	d5e952e4b2	房屋排序	4 years ago
zxc	d0bc110a56	房屋排序	4 years ago
zxc	df919f5121	楼栋排序	4 years ago
jianjun	8cb6a23b64	微调	4 years ago
jianjun	429cf2841e	Merge remote-tracking branch 'remotes/origin/dev' into dev_resi_export # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java # 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-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/service/impl/IcResiUserServiceImpl.java	4 years ago
zhaoqifeng	538d97d87d	Merge branch 'dev_bugfix_ljj' into dev	4 years ago
jianjun	e6017c4465	这个代码被删除了 恢复	4 years ago
zhaoqifeng	022c7acba3	list转map key重复	4 years ago
jianjun	edfe9b063c	导出返回错误信息 2	4 years ago
jianjun	dbf7001c1b	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
jianjun	e387fca7de	导出返回错误信息	4 years ago
sunyuchao	d1f3d208c9	bug修改，增加同组织下模板名不能重复校验	4 years ago
jianjun	d2f583f1ee	代码微调	4 years ago
jianjun	4caebaf21c	代码微调	4 years ago
zxc	6957c75b66	小区导入	4 years ago
zxc	40d6c23b75	排序修改	4 years ago
zxc	495fbc3336	排序修改	4 years ago
zxc	ce76dd0bb5	排序修改	4 years ago
jianjun	050d67deda	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
jianjun	a84822f745	添加注释	4 years ago
zhaoqifeng	0ff35b0a2a	自定义导出模板列表及模板详情	4 years ago
jianjun	c1274e2423	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
jianjun	94c816662e	获取子节点	4 years ago
zxc	6f5dae4a38	关注名单详情	4 years ago
jianjun	75a99e42ea	生成id	4 years ago
sunyuchao	4870264524	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java	4 years ago
sunyuchao	83862a09d8	疫苗接种情况增加详情接口	4 years ago
jianjun	61315feeb4	删除多余的方法	4 years ago