wangchao
|
c32942d7b0
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
wangchao
|
1d98884381
|
组员列表、入群审核列表返回徽章列表
|
5 years ago |
yinzuomei
|
567029b0f9
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
yinzuomei
|
71958d8bfa
|
个人中心-我发起的议题列表-已关闭
|
5 years ago |
wxz
|
76c94e1832
|
修改：个人中心-我的话题列表接口，返回值增加releaseGridName字段
|
5 years ago |
|
wxz
|
a5890c17b3
|
Merge branch 'dev_personal_center' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_personal_center
|
5 years ago |
|
wxz
|
e3540f13cd
|
修改：权限枚举增加徽章管理模块
|
5 years ago |
|
yinzuomei
|
b1fadfc857
|
合并代码走丢了
|
5 years ago |
|
yinzuomei
|
2961f7038d
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
# 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
# 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/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/IssueDao.xml
# epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/IssueController.java
# epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/IssueService.java
# epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java
|
5 years ago |
|
yinzuomei
|
38d70dd456
|
我发起的议题已关闭+已转项目
|
5 years ago |
|
wxz
|
3b6c4b224c
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
wxz
|
ae46b8ee8e
|
修改：增加徽章审核权限枚举
|
5 years ago |
liushaowen
|
e9b5e61b2e
|
我的建议列表新增建议类型
|
5 years ago |
zxc
|
e7b30034b0
|
我发起的议题-表决中
|
5 years ago |
|
liushaowen
|
f5bb49acfe
|
添加dto
|
5 years ago |
|
wangchao
|
02087e11fa
|
话题接口加上徽章
|
5 years ago |
sunyuchao
|
41b1e7d345
|
接口测试问题修改
|
5 years ago |
|
liushaowen
|
52667f9eb4
|
我的建议列表bug修复
|
5 years ago |
|
liushaowen
|
ba84fb5ca9
|
Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center
|
5 years ago |
|
liushaowen
|
be5266fa87
|
解决冲突
|
5 years ago |
zhaoqifeng
|
c2f8c4c994
|
账号安全-修改手机号
|
5 years ago |
|
liushaowen
|
0903b90f87
|
Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
5 years ago |
|
liushaowen
|
5822b86a66
|
补充fallback
|
5 years ago |
|
zhaoqifeng
|
c803be8cb6
|
账号安全-修改手机号
|
5 years ago |
|
zxc
|
38032e1035
|
议题入参
|
5 years ago |
|
liushaowen
|
2dd3615dee
|
建议-resi模块修改
|
5 years ago |
|
liushaowen
|
2e47c80379
|
Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center
|
5 years ago |
|
liushaowen
|
e834c9b967
|
我的建议列表添加ifnull
|
5 years ago |
|
sunyuchao
|
fe99f824be
|
个人中心-我参与的项目列表
|
5 years ago |
|
zxc
|
8545acc885
|
常量
|
5 years ago |
|
zxc
|
a2d7532595
|
徽章
|
5 years ago |
|
zxc
|
0f79010450
|
徽章、我参与的议题
|
5 years ago |
|
wxz
|
776d6f3092
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
wxz
|
9ac03f65d0
|
新增：个人中心-我发表的话题列表 增加分页
|
5 years ago |
|
zxc
|
121cf34f61
|
徽章
|
5 years ago |
|
wxz
|
62b0eb9995
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
wxz
|
18508ba133
|
新增：个人中心-我发表的话题列表，网格名称查询TODO
|
5 years ago |
|
liushaowen
|
c215274733
|
居民端-提交建议
|
5 years ago |
|
zxc
|
8f3878c9ac
|
徽章
|
5 years ago |
|
zxc
|
61b9ac47d9
|
徽章认证详情
|
5 years ago |
|
zxc
|
b938e5e0c3
|
徽章
|
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 |
|
zhaoqifeng
|
bd7685fb99
|
徽章审核修改
|
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
|
d9f88b1116
|
修改入参方式
|
5 years ago |
|
liushaowen
|
820e40e3b9
|
修改入参方式
|
5 years ago |
