Tree: 65b8ac45f2

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 '65b8ac45f2'

${ noResults }

Commit Graph

7428 Commits (65b8ac45f2398aa386ec5255f16ee86395a8c1ec)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	96d4a01c80	徽章修改	5 years ago
zhaoqifeng	f7dd854487	运营端-客户高级配置	5 years ago
zxc	50ded670bb	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	473342fd54	徽章修改	5 years ago
jianjun	d108faaf98	徽章添加 排序	5 years ago
jianjun	69e9bffe47	Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center	5 years ago
jianjun	c089cb9379	"党员认证通过后参数校验"	5 years ago
yinzuomei	e32356b1e2	Merge remote-tracking branch 'origin/dev_group_code' into dev_temp # Conflicts: # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java	5 years ago
yinzuomei	fa98880154	修改/resi/group/member/getapplyingmember接口，新增返参enterGroupType	5 years ago
zhaoqifeng	23cd7d3873	徽章审核通过消息	5 years ago
yinzuomei	f3d5414eb4	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp	5 years ago
yinzuomei	e3366b92e5	@NotNull	5 years ago
yinzuomei	eda995bb98	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp	5 years ago
yinzuomei	6ec49d6b1c	@NotNull	5 years ago
yinzuomei	dd053cadb3	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp	5 years ago
yinzuomei	2c1630f065	添加默认构造方法	5 years ago
yinzuomei	8cc90fc404	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp # Conflicts: # epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java # epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml # 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/pom.xml # epmet-user/epmet-user-server/src/main/resources/bootstrap.yml	5 years ago
zxc	ec4e77feb6	Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp	5 years ago
zxc	504dc19e81	调用feign接口修改	5 years ago
zhaoqifeng	461753e5dc	运营端-客户高级配置	5 years ago
yinzuomei	948924fecb	议题审核：工作端列表，审核历史 v2	5 years ago
yinzuomei	ccc0c6259c	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit # Conflicts: # epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java # epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java	5 years ago
yinzuomei	8945db5962	议题审核：工作端列表，审核历史	5 years ago
zxc	7bcce857e6	详情	5 years ago
zxc	0f9f30a0ad	详情	5 years ago
yinzuomei	1499ae5973	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit	5 years ago
yinzuomei	776682b699	居民端：话题转议题申请详情- 审核历史查询	5 years ago
zxc	5dcbe85c74	详情	5 years ago
zxc	4e029a3c4f	详情	5 years ago
zxc	a30b34f994	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit # Conflicts: # epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java # epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java	5 years ago
zxc	e559914843	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit # Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java # epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java # epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java # epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java # epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java # epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java # epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java # epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java # epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml # 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/pom.xml # epmet-user/epmet-user-server/src/main/resources/bootstrap.yml	5 years ago
liushaowen	7278ac71fd	Merge branch 'dev_personal_center' into dev_temp	5 years ago
liushaowen	827f1c79df	Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center	5 years ago
liushaowen	db641b2927	user_advice修改content字段	5 years ago
yinzuomei	83ab07aeae	居民端议题审核相关：待审核||已驳回 申请列表	5 years ago
zxc	35bd26f5a2	徽章修改	5 years ago
zxc	f8bd8b78ce	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	4e6d7169ba	徽章修改	5 years ago
zhaoqifeng	4419736b34	个人信息修改-小区名称和楼栋单元为空时基本信息没有更新问题修改	5 years ago
sunyuchao	aa2a27c6a4	Merge branch 'dev_personal_center' into dev_temp	5 years ago
sunyuchao	dc99121d67	注解	5 years ago
liushaowen	1bce7e8d49	提交建议bug修复	5 years ago
zhaoqifeng	6098ca0257	运营端-客户高级配置	5 years ago
zxc	b494e64e78	徽章修改	5 years ago
yinzuomei	b73ab3efce	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp # Conflicts: # 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	5 years ago
jianjun	5cd92d4377	党员认证通过后参数调整	5 years ago
jianjun	f322f10315	党员认证通过后放个调整	5 years ago
jianjun	ad962dd531	Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center	5 years ago
jianjun	d948ad0b39	党员认证通过后放个调整	5 years ago
yinzuomei	64d5d5bb18	Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center	5 years ago