Tree: 0014fa06bb

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 '0014fa06bb'

${ noResults }

Commit Graph

7598 Commits (0014fa06bb2ac80f3a60d866a467d01e659969a2)

 

All Branches   

Search

Author	SHA1	Message	Date
wangchao	5716428605	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp	5 years ago
wangchao	3d38a2837a	修复二次提交议题	5 years ago
liushaowen	d333748dc3	Merge branch 'dev_temp' of http://121.42.41.42:7070/r/epmet-cloud into dev_temp	5 years ago
liushaowen	d8e89a1685	Merge branch 'dev_wx_msg' into dev_temp	5 years ago
liushaowen	fc984fb013	微信订阅外挂bug修复	5 years ago
zxc	5f483565ed	先生/女士 修改	5 years ago
wangchao	248d052b74	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp	5 years ago
wangchao	79e4db6e26	二次提交时不新增application_history	5 years ago
wangchao	fce9e5c236	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit	5 years ago
zxc	9e085cc604	feign调用添加判断	5 years ago
wxz	a9efa6e4d6	Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center	5 years ago
wxz	cd014fc47e	文案写错(已转项目写成已转议题)修改	5 years ago
wangchao	b74341e5f0	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp	5 years ago
wangchao	a859a7a364	mybatis sql过滤器修改	5 years ago
wangchao	99853fce36	openFeign修改	5 years ago
wangchao	81c006e168	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit # Conflicts: # epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java # epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java	5 years ago
wangchao	acd1cee757	议题审核	5 years ago
yinzuomei	cd4c710fbf	Merge remote-tracking branch 'origin/dev_temp' into dev_temp	5 years ago
yinzuomei	65b8ac45f2	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp # Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java # 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/group/service/ResiGroupService.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/resources/bootstrap.yml	5 years ago
zxc	1775c4516b	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	0c9515018d	徽章修改	5 years ago
yinzuomei	6235c4e920	个人中心-我发起的议题-审核中列表接口	5 years ago
sunyuchao	9bd2c7fee9	Merge branch 'dev_personal_center' into dev_temp	5 years ago
sunyuchao	cffbb48e23	Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center	5 years ago
sunyuchao	8a9d6e1909	旧接口程序完善	5 years ago
zxc	bf09f011f2	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	de55c79642	徽章排序修改，提交审核添加校验	5 years ago
jianjun	acced80c6d	Merge remote-tracking branch 'origin/dev_temp' into dev_temp	5 years ago
jianjun	9c160e3290	修改合并错误	5 years ago
zxc	7d6f4b4921	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	4c9f872ecf	徽章修改	5 years ago
yinzuomei	3fc38ecffa	issue_application、issue_application_history 新增auto_passed:自动通过	5 years ago
jianjun	11f352a345	Merge remote-tracking branch 'remotes/origin/dev_group_code' into dev_temp # Conflicts: # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java # epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml # 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	9140cef871	修改合并错误	5 years ago
wangchao	0a95f842c9	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
jianjun	b2588abaee	Merge remote-tracking branch 'remotes/origin/dev_personal_center' 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-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-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # 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
wangchao	4e117ec2d0	居民端显示用户徽章，如果用户是点亮状态，但是客户的徽章被下线，缓存中不会出现此徽章，但是数据库中依然存在，且是点亮状态。	5 years ago
zxc	1a788b6b31	冲突修改	5 years ago
zxc	a8145b5fef	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp # Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java # 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/group/service/ResiGroupService.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java # epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.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	5 years ago
jianjun	dfeabf616c	Merge remote-tracking branch 'remotes/origin/dev' into dev_group_code # Conflicts: # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # epmet-module/resi-group/resi-group-server/pom.xml # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java # epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml # 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
yinzuomei	bbd6ac286d	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit	5 years ago
yinzuomei	bdc4867ec2	工作端待审核、已驳回添加权限校验注解	5 years ago
zxc	0a40ab2088	徽章修改	5 years ago
jianjun	757c10d568	Merge remote-tracking branch 'remotes/origin/dev' into dev_personal_center # Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java # 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/group/service/ResiGroupService.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml # epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.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	5 years ago
zxc	787c280b37	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	2f034a045c	我发起的议题表决中 url修改	5 years ago
wangchao	acf87a36be	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp	5 years ago
wangchao	9f73be0db0	居民端话题转议题	5 years ago
wxz	d95d31f073	恢复x文件	5 years ago
wxz	1a162a1623	删除x文件	5 years ago