Tree: 1a1361f9b1

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 '1a1361f9b1'

${ noResults }

Commit Graph

7211 Commits (1a1361f9b1b28857f33d7db502c29d1a316a12b7)

 

All Branches   

Search

Author	SHA1	Message	Date
liushaowen	88839f72eb	Merge branch 'dev_personal_center' into dev_temp # Conflicts: # epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java	5 years ago
liushaowen	c215274733	居民端-提交建议	5 years ago
zxc	545bc2215c	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	8f3878c9ac	徽章	5 years ago
zxc	fba37ee301	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	61b9ac47d9	徽章认证详情	5 years ago
zxc	9103781ca3	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	b938e5e0c3	徽章	5 years ago
zxc	04a00698ed	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	a32606c1a4	徽章修改	5 years ago
wangchao	5ec92813b1	Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center	5 years ago
zxc	f86e6bb09c	徽章初始化添加方法	5 years ago
wangchao	82cf902db8	redis pipelined批量取值加上解析器	5 years ago
zxc	50230da566	issue	5 years ago
sunyuchao	8590a12fcc	Merge branch 'dev_wx_msg' into dev	5 years ago
sunyuchao	0eb24d42a0	消息推送生产环境获取accesstoken错误问题	5 years ago
zhaoqifeng	bd7685fb99	徽章审核修改	5 years ago
jianjun	34bafa0a10	Merge remote-tracking branch 'remotes/origin/dev_personal_center' into dev_temp # Conflicts: # epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java	5 years ago
jianjun	3e76fdb481	Merge remote-tracking branch 'remotes/origin/dev' into dev_personal_center # Conflicts: # epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.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
liushaowen	f5eb1fbb98	Merge branch 'dev_personal_center' into dev_temp	5 years ago
liushaowen	d9f88b1116	修改入参方式	5 years ago
liushaowen	820e40e3b9	修改入参方式	5 years ago
zxc	6570ef9807	修改包名	5 years ago
zxc	136c5e9c13	注释	5 years ago
wangchao	5da4bafe10	Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center	5 years ago
wangchao	6bb97351e1	获取用户勋章增加补偿，批量删除用户徽章，将keys操作放在管道外，否则返回null，具体原因还在查。。。	5 years ago
liushaowen	86ac79a366	居民端-我的建议列表	5 years ago
liushaowen	31ea4f4f41	居民端建议	5 years ago
liushaowen	3eb04ecf4d	Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center	5 years ago
liushaowen	079d9f2a26	居民端-我的建议列表	5 years ago
zxc	cad3cf7078	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	f9df6920ab	徽章	5 years ago
jianjun	4002244d03	Merge remote-tracking branch 'remotes/origin/dev_wx_msg' into dev	5 years ago
jianjun	b691768f70	Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev	5 years ago
liushaowen	5eea08c7b1	Merge branch 'dev_personal_center' into dev_temp	5 years ago
liushaowen	b9a448c582	bug	5 years ago
liushaowen	c9ed536938	Merge branch 'dev_personal_center' into dev_temp	5 years ago
liushaowen	a205829dfb	bug修复	5 years ago
liushaowen	576753b4a0	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
liushaowen	36d6286363	Merge remote-tracking branch 'origin/dev_temp' into dev_temp # Conflicts: # epmet-module/data-report/data-report-server/pom.xml # epmet-module/data-statistical/data-statistical-server/pom.xml # epmet-module/epmet-message/epmet-message-server/pom.xml # epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml # epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java # epmet-module/epmet-third/epmet-third-server/pom.xml # epmet-module/gov-org/gov-org-server/pom.xml # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml # epmet-module/gov-project/gov-project-server/pom.xml # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java	5 years ago
liushaowen	7119330af5	添加审核模块配置	5 years ago
liushaowen	bfbdc178a3	用户建议 添加审核func	5 years ago
zxc	076ac9654e	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	7fb40dc779	徽章状态修改	5 years ago
liushaowen	806a9b7583	advice运营端接口over	5 years ago
wxz	a3c8b4a19c	Merge branch 'dev' into dev_temp	5 years ago
wxz	06bea0763b	修改dev,test compose文件，添加版本占位符	5 years ago
zxc	d4d233d78f	徽章	5 years ago
jianjun	bca15b94a5	Merge remote-tracking branch 'remotes/origin/dev_personal_center' into dev_temp # Conflicts: # epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.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	fa01afd558	Merge remote-tracking branch 'remotes/origin/dev_group_edit' into dev_temp # Conflicts: # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java	5 years ago