Tree: 3fc38ecffa

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '3fc38ecffa'

${ noResults }

Commit Graph

6459 Commits (3fc38ecffa26e310ceeb07335b6f41ddaa3cb1a5)

 

All Branches   

Search

Author	SHA1	Message	Date
yinzuomei	3fc38ecffa	issue_application、issue_application_history 新增auto_passed:自动通过	6 years ago
jianjun	9140cef871	修改合并错误	6 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	6 years ago
yinzuomei	bbd6ac286d	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit	6 years ago
yinzuomei	bdc4867ec2	工作端待审核、已驳回添加权限校验注解	6 years ago
zxc	0a40ab2088	徽章修改	6 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	6 years ago
zxc	2f034a045c	我发起的议题表决中 url修改	6 years ago
wangchao	9f73be0db0	居民端话题转议题	6 years ago
wxz	d95d31f073	恢复x文件	6 years ago
wxz	1a162a1623	删除x文件	6 years ago
wxz	2c7e78572d	加个空格	6 years ago
wxz	ee233c81e9	Merge branch 'dev_group_edit' into dev # Conflicts: # 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	6 years ago
zxc	01a42497c3	用户徽章缓存修改	6 years ago
wangchao	1e4590dab6	Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit	6 years ago
wangchao	e063404c8e	议题审核	6 years ago
zxc	cee30082bb	议题审核历史加权限	6 years ago
jianjun	5311a12228	日志添加参数	6 years ago
zxc	61336b1998	议题审核详情，历史	6 years ago
sunyuchao	896c9fd3f3	Merge branch 'dev_wx_msg' into dev	6 years ago
liushaowen	873faa606f	下调发送订阅的错误日志级别	6 years ago
zxc	aad2545c73	徽章修改	6 years ago
zxc	7608d28957	徽章修改	6 years ago
yinzuomei	d037b228fc	居民端话题详情接口修改，添加屏蔽信息,屏蔽理由前面拼接 "话题已屏蔽："	6 years ago
liushaowen	1d189ffee7	Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center	6 years ago
liushaowen	5127b22ce8	提交建议bug修复	6 years ago
zhaoqifeng	d5338acbf9	徽章待审核列表修改	6 years ago
yinzuomei	bfcdad9b52	Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center	6 years ago
yinzuomei	5606599f11	个人中心-我参与的话题去除已屏蔽的话题，修改selectParticipatedTopics sql 漏了个.	6 years ago
zxc	15534db33b	徽章修改	6 years ago
yinzuomei	67eb7ef1f6	Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center	6 years ago
yinzuomei	05fe810ed0	居民端话题详情接口修改，添加屏蔽信息	6 years ago
zxc	619e1cbde4	徽章修改	6 years ago
zhaoqifeng	1a79180b2c	徽章删除问题修改，徽章列表添加type字段	6 years ago
yinzuomei	cbb074fb02	Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center	6 years ago
yinzuomei	c03523e066	个人中心-我参与的话题去除已屏蔽的话题，修改selectParticipatedTopics sql	6 years ago
zxc	87f4e904b0	徽章修改	6 years ago
zxc	1ab9eecc7a	徽章修改	6 years ago
zxc	5d16a38417	徽章修改	6 years ago
zhaoqifeng	9369314986	居民端头像从user_base_info获取	6 years ago
yinzuomei	133db38da4	selectListByIssueApplicationId sql修改	6 years ago
liushaowen	51738f72db	建议bug修复	6 years ago
yinzuomei	c38dc8b867	工作端议题审核，待审核+已驳回接口拆分为2个。v2	6 years ago
zxc	675cf6bd92	徽章修改	6 years ago
jianjun	6a8c6e4cb8	徽章添加 初始化脚本 调整字段长度	6 years ago
yinzuomei	c899840b0a	工作端议题审核，待审核+已驳回接口拆分为2个。	6 years ago
jianjun	39c86ad1f2	徽章添加 初始化脚本 调整字段长度	6 years ago
jianjun	4489d35f94	徽章添加 初始化脚本	6 years ago
zhaoqifeng	e0fc623acd	居民端头像从user_base_info获取	6 years ago
zxc	be4c32f755	徽章修改	6 years ago