Tree: 62ef8c0cda

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '62ef8c0cda'

${ noResults }

Commit Graph

7542 Commits (62ef8c0cdae4efff77c486f94daa84938af74edf)

 

All Branches   

Search

Author	SHA1	Message	Date
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
jianjun	02911783e4	Merge remote-tracking branch 'remotes/origin/dev_wx_msg' into dev_temp	5 years ago
jianjun	68feb3d1fe	Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_wx_msg	5 years ago
wxz	b3a8a95859	Merge branch 'dev_exception_handle' into dev	5 years ago
sunyuchao	36b15863a1	Merge branches 'dev' and 'dev_wx_msg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_wx_msg	5 years ago
zxc	5055d35514	徽章	5 years ago
liushaowen	1ad642c40e	Merge remote-tracking branch 'origin/dev_temp' into dev_temp # Conflicts: # 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	5 years ago
liushaowen	c9b520f0b8	党员审核通过不发站内信和订阅信息有误的bug	5 years ago
jianjun	1f4d8927b7	徽章审核添加 网格Id 参数,缺少参数校验	5 years ago
zxc	318d37d6de	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp	5 years ago
zxc	75e4427d79	徽章初始化	5 years ago
zxc	c9c139dcd5	徽章	5 years ago
zxc	8a798d6d03	徽章	5 years ago
wangchao	6ddf4700a1	Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center	5 years ago
liushaowen	e28e505669	useradvice	5 years ago
zhaoqifeng	01d3de94a7	徽章审核消息通知	5 years ago
wangchao	602d79547c	批量删除用户勋章	5 years ago
wangchao	3804804c46	Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp	5 years ago
wangchao	5bc09bf063	难点赌点 过滤修改 xm	5 years ago
zxc	5cbfc15809	Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp # Conflicts: # 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	5 years ago