Tree: ed36b7725e

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'ed36b7725e'

${ noResults }

Commit Graph

22130 Commits (ed36b7725e45943c7bb3aa9147a5a097603c9d42)

 

All Branches   

Search

Author	SHA1	Message	Date
YUJT	ed36b7725e	Merge branch 'master' of http://121.42.41.42:7070/r/empet_cloud_yantai into master_yantai	3 years ago
YUJT	d866c3b891	Merge branch 'bugfix/teamB_shuangshi' into master_yantai	3 years ago
wangxianzhang	e3c54e01d7	Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud	3 years ago
wangxianzhang	41a1f972ad	Merge remote-tracking branch 'origin/master'	3 years ago
wangxianzhang	ca1dce3df4	【社区服务】修复：1.发起服务时候拼接的服务目标ID_PATH错误。2.服务记录列表查询加上当前组织条件	3 years ago
wangxianzhang	af11feb2a6	【社区服务】修复：1.发起服务时候拼接的服务目标ID_PATH错误。2.服务记录列表查询加上当前组织条件	3 years ago
wangxianzhang	24d8f6dfd1	Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud	3 years ago
Jackwang	4f01887cf7	双实信息录入-小区详情备注字段调整	3 years ago
YUJT	ca889c74c9	Merge branch 'feature/dev_sunjiatan_moveout' into master_yantai	3 years ago
YUJT	e3d9538cc3	Merge branch 'feature/dev_sunjiatan_moveout'	3 years ago
jianjun	7511d751d5	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台master	3 years ago
yinzuomei	077ce1bb6d	bugfix	3 years ago
yinzuomei	23060d0ec3	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	3 years ago
yinzuomei	4cbb882805	bugfix	3 years ago
jianjun	1a092fd66c	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台master # Conflicts: # 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/entity/IcHouseEntity.java # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml # epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java # epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml	3 years ago
jianjun	625c19c607	Merge remote-tracking branch 'remotes/origin/dev_new_article' into 烟台master	3 years ago
zhaoqifeng	d53b466939	移除审核需求变动	3 years ago
jianjun	3ee7fc1f97	删除错误的方法	3 years ago
zhaoqifeng	959f8f1e39	移除审核需求变动	3 years ago
zxc	f206132b26	疫苗接种关注名单取消关注	3 years ago
yinzuomei	8f4bbc7f56	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	3 years ago
yinzuomei	1f4893582b	/epmetuser/icresiuser/searchbyname接口调整	3 years ago
jianjun	b15016f6eb	没有删除状态	3 years ago
sunyuchao	1292ae08b2	提错分支了	3 years ago
sunyuchao	09ee9b9ebe	脚本	3 years ago
yinzuomei	5e612f6520	别报孔了	3 years ago
YUJT	0ce9f51dc2	Merge branch 'bugfix/party_manage' into master_yantai	3 years ago
YUJT	3ec6558475	Merge branch 'feature/dev_sunjiatan' into master_yantai # Conflicts: # 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/entity/IcHouseEntity.java # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml # 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/IcResiUserServiceImpl.java # epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml	3 years ago
YUJT	f886de36fe	Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud	3 years ago
YUJT	0cef42f337	Merge branch 'bugfix/party_manage'	3 years ago
YUJT	f7bb6a0b2f	Merge branch 'feature/dev_sunjiatan'	3 years ago
wangxianzhang	8faa66a022	-	3 years ago
wangxianzhang	92e0831c81	-	3 years ago
wangxianzhang	d656dc43bd	【居民信息导入】修改捕获异常之后，获取异常信息方式	3 years ago
wangxianzhang	d70c00a1db	【居民信息导入】修改：options的label重复，抛出自定义错误内容	3 years ago
wangxianzhang	f8f28b8e70	【居民信息导入】修改：错误描述文件中增加手机号一列	3 years ago
wangxianzhang	9ca2704e3b	Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud	3 years ago
zhaoqifeng	27f32692a1	移除审核需求变动	3 years ago
yinzuomei	b7e59aa80f	Merge remote-tracking branch 'origin/dev_bugfix_ljj'	3 years ago
yinzuomei	9f02395806	/data/stats/statsproject/gridprojectstats参数修改	3 years ago
jianjun	ed1c2989b0	Merge remote-tracking branch 'remotes/origin/dev_new_article'	3 years ago
YUJT	819170db1c	Merge branch 'bugfix/party_manage' into master_yantai	3 years ago
YUJT	7c658d6180	Merge branch 'bugfix/party_manage'	3 years ago
jianjun	708f036c79	文章内容null处理	3 years ago
yinzuomei	267be37ef0	Merge remote-tracking branch 'origin/dev_new_article'	3 years ago
jianjun	761593a47d	Revert "文章内容null处理" This reverts commit f4c81b55	3 years ago
yinzuomei	ed07263a36	Merge remote-tracking branch 'origin/dev_new_article'	3 years ago
jianjun	f4c81b55e6	文章内容null处理	3 years ago
yinzuomei	570d49b6b4	/file/article/upload超过2M的压缩图片	3 years ago
jianjun	b8d503ded1	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台master	3 years ago