jianjun
|
88e9dea55a
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
|
5 years ago |
jianjun
|
0ca6b0dabc
|
判断错误
|
5 years ago |
zxc
|
eca7c1e3cc
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
zxc
|
5a4caba09a
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
zxc
|
4257985e73
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
zxc
|
a2d7532595
|
徽章
|
5 years ago |
jianjun
|
d340baa3b3
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
|
5 years ago |
jianjun
|
e82eaf53ec
|
业务数据抽取统计 添加聚合入口,便于 删除网格后
|
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
|
b0eab2d9f6
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
|
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
|
982f63f4cb
|
Merge branch 'dev_temp' of http://121.42.41.42:7070/r/epmet-cloud into dev_temp
|
5 years ago |
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 |
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 |