Tree: a1f3b4579d

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'a1f3b4579d'

${ noResults }

Commit Graph

25700 Commits (a1f3b4579d4a23c48c0ff6ebbf72945984aae7ea)

 

All Branches   

Search

Author	SHA1	Message	Date
lichao	a1f3b4579d	Merge branch 'yantai_zhengwu_master' into dev	3 years ago
lichao	31fee9c480	烟台需求、新增组织字段	3 years ago
yinzuomei	6760a04f21	Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master	3 years ago
lichao	345b07392b	Merge branch 'yantai_zhengwu_master' into dev # Conflicts: # epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java # epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java # epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java	3 years ago
yinzuomei	3d72b83b87	gov/org/propertymanagement/page新增联系人，联系电话	3 years ago
lichao	8ae98006d2	用户详情、修改	3 years ago
yinzuomei	a544dcf96e	Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev	3 years ago
yinzuomei	52c573be18	ic_property_management表新增联系人，联系电话	3 years ago
lichao	b3dfe459a2	冲突解决	3 years ago
lichao	0c42e94cc5	Merge branch 'yantai_zhengwu_master' into dev # Conflicts: # epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java # epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java # epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java	3 years ago
lichao	d131fd9581	通讯录新增烟台需求字段	3 years ago
yinzuomei	eea41134b6	Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master	3 years ago
yinzuomei	2f8ff0b366	Merge remote-tracking branch 'origin/dev_bugfix_ljj'	3 years ago
yinzuomei	c0b8e88121	Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev	3 years ago
yinzuomei	b511b7a667	FINISH_SEND_TIME	3 years ago
yinzuomei	690256a7f7	Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev	3 years ago
yinzuomei	330e2bfc82	/message/organization/message/list;NullPointerException	3 years ago
yinzuomei	68887bbeb6	Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev	3 years ago
yinzuomei	30c353f013	bugfix	3 years ago
yinzuomei	875324143e	Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev	3 years ago
yinzuomei	f8c5ae7324	发送消息	3 years ago
wxz	63810e45b0	Merge branch 'lingshan_master' into dev	3 years ago
wxz	4f23043d56	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	3 years ago
wxz	7659d2fc44	1.修改：删除文章栏目。禁止删除一级栏目	3 years ago
yinzuomei	e037148819	Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev	3 years ago
yinzuomei	09fc9988fb	保存了内容，还没发消息	3 years ago
wxz	4ae7d29190	1.修改：工作人员编辑页面初始化接口editstaffinit,增加idcard，culture,cultureDisplay字段的返回	3 years ago
yinzuomei	0fd79ffcb6	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	3 years ago
yinzuomei	208d516403	工作人员缓存增加pid,orgIdPath	3 years ago
yinzuomei	0b71ba8f79	消息管理未完待续.	3 years ago
wxz	88c600fbd1	Merge branch 'lingshan_master' into dev # Conflicts: # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java	3 years ago
wxz	033e59dc07	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	3 years ago
wxz	4f442eff01	1.修改：新增工作人员addstaffv2接口，增加文化程度的字段、idCard的字段，并且内部逻辑中，通过解析idCard得到出生日期，并且存储 2.修改：编辑工作人员editstaff接口，增加文化程度的字段、idCard的字段，并且内部逻辑中，通过解析idCard得到出生日期，并且存储	3 years ago
wxz	7e37e6e9f9	Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master	3 years ago
wxz	f16974a20f	Merge remote-tracking branch 'origin/master'	3 years ago
wxz	1b7c69afc2	修改身份证正则解析工具类，增加出生日期[LocalDate类型]的返回	3 years ago
yinzuomei	64976a43fa	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev # Conflicts: # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java	3 years ago
yinzuomei	5b69b9843e	/resi/partymember/icPartyOrg/editPrincipal接口principalStaffId不必填；	3 years ago
wxz	46b63638e8	【小组】大屏查询小组	3 years ago
wxz	1f0cb8d472	Merge branch 'master' into lingshan_master # Conflicts: # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java	3 years ago
wxz	a6db5f9810	【小组】创建小组-增加orgIdpath,agencyId	3 years ago
wxz	3776c6fe21	Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud	3 years ago
wxz	e53a097f99	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	3 years ago
yinzuomei	2e1dfe9277	居民信息列表查询排序调整	3 years ago
yinzuomei	6d9964e3a4	Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev	3 years ago
yinzuomei	494b9881f1	Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master Conflicts: epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml	3 years ago
wxz	638afa239e	Merge branch 'lingshan_master' into dev	3 years ago
wxz	c0f81da07f	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	3 years ago
wxz	67396a3ad1	特殊人群：增加查询各类人员分布了	3 years ago
yinzuomei	e76e075c9c	市北反馈社区安全服务列表查询不出来	3 years ago