Tree: 9de299abf8

dev

dev_shibei_match

feature/teamB_zz_wgh

master

release

2021_0831_2159_before_pinginpush_mergeinto

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '9de299abf8'

${ noResults }

Commit Graph

807 Commits (9de299abf8d2e66d06bb45e10e25518d1ab25b0c)

 

All Branches   

Search

Author	SHA1	Message	Date
wangchao	2b651121ce	Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg # Conflicts: # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java	5 years ago
zxc	207b4cf00c	已认证党员查询	5 years ago
wangchao	5eda827981	删除无用注释	5 years ago
yinzuomei	2a90464e0d	Merge branches 'dev' and 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg	5 years ago
sunyuchao	1d8ad538ae	解决代码被人覆盖问题以及所有接口返参不允许出现null问题	5 years ago
yinzuomei	5fdaf6c62c	Merge remote-tracking branch 'origin/dev_govgrid' into dev # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java	5 years ago
yinzuomei	34bd289746	Merge remote-tracking branch 'origin/dev_govorg' into dev	5 years ago
yinzuomei	9a50e7fc27	冲突解决	5 years ago
yinzuomei	57f93b0e6a	冲突解决	5 years ago
yinzuomei	17588ca852	Merge remote-tracking branch 'origin/dev_govgrid' into dev # Conflicts: # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java	5 years ago
sunyuchao	cda2ef7bad	地区编码字段由int改为string	5 years ago
yinzuomei	1e52eaa365	Merge remote-tracking branch 'origin/dev_govorg' into dev # Conflicts: # epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovAccessFeignClient.java	5 years ago
yinzuomei	a281bee5c3	Merge remote-tracking branch 'origin/dev_govgrid' into dev_govgrid	5 years ago
yinzuomei	f46d0fbc0b	partymember_confirm_manual添加read_flag,党员认证审核历史接口、查询待审核接口开发	5 years ago
sunyuchao	2d84ce7787	政府端-组织、部门模块程序优化	5 years ago
wangchao	8bb23839b1	政府端话题管理相关接口	5 years ago
wxz	a94e444182	Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java	5 years ago
wxz	292a867842	1.去除FeignClient的url	5 years ago
wxz	ab98d22c1f	1.基本完成了权限部分，除上级，同级其他，我参与的	5 years ago
wangchao	225058e2a0	Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java # epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java # epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml	5 years ago
wangchao	bd4c80705b	网格管理、部门管理接口相关	5 years ago
yinzuomei	bed38d9f95	user0.3.4,gov0.3.6发版	5 years ago
yinzuomei	c61ba9a930	Merge remote-tracking branch 'origin/dev_govorg' into dev	5 years ago
zhaoqifeng	bc7fcbca7c	customer_staff表结构修改	5 years ago
zhaoqifeng	63e16b80d9	组织-工作人员相关接口 bug修改	5 years ago
yinzuomei	e0a8ccaa18	govorg,user发版	5 years ago
yinzuomei	02fa3d5e28	Merge remote-tracking branch 'origin/dev_govorg' into dev	5 years ago
yinzuomei	2b470a9efb	党员认证-接口入口初始化service	5 years ago
yinzuomei	0050dd53b1	feignurl去除localhost	5 years ago
sunyuchao	f9c6972ea5	政府端-接口自测程序修改	5 years ago
sunyuchao	37bdf01c14	Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg	5 years ago
sunyuchao	add02f0210	数据库字段类型变动	5 years ago
yinzuomei	4d733c7db9	- /auth/gov/loginwxmp/loginout配置拦截	5 years ago
yinzuomei	dc4769ffba	- /auth/gov/loginwxmp/loginout配置拦截	5 years ago
yinzuomei	3551dd91f5	党员认证-接口入口	5 years ago
yinzuomei	0c87e7363a	govorg0.3.4获取我的组织接口发版	5 years ago
yinzuomei	3ac2ee220e	Merge branches 'dev' and 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	5 years ago
yinzuomei	de90ddcbd3	getMyOrg接口修改发版测试1	5 years ago
yinzuomei	801b33ada8	getMyOrg接口修改发版测试	5 years ago
yinzuomei	36c155d779	Merge remote-tracking branch 'origin/dev_govorg' into dev	5 years ago
yinzuomei	1a7d769139	getMyOrg接口修改	5 years ago
zxc	b85a33b229	网格名称重复问题	5 years ago
yinzuomei	13e8390b90	govorg,epmetuser0.3.2	5 years ago
yinzuomei	f9c83f6b24	Merge branches 'dev' and 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	5 years ago
zxc	46d7f7ff76	网格删除修改	5 years ago
yinzuomei	fa5ad036e5	0.3.1版本	5 years ago
yinzuomei	b6cee29165	0.3.1版本	5 years ago
yinzuomei	70853b9aed	合并冲突解决	5 years ago
yinzuomei	e116cfda49	Merge remote-tracking branch 'origin/dev_govorg' into dev # Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java # epmet-gateway/pom.xml # epmet-gateway/src/main/resources/bootstrap.yml # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java # epmet-module/pom.xml	5 years ago
yinzuomei	906cc8957c	Merge remote-tracking branch 'origin/dev_govgrid' into dev	5 years ago