sunyuchao
|
bf64e4de6c
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
sunyuchao
|
19fae500d5
|
bug修改
|
5 years ago |
jianjun
|
ff7a3abb01
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
sunyuchao
|
083db83bce
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
sunyuchao
|
5d0d775849
|
时间类型添加@JsonFormat注解
|
5 years ago |
|
jianjun
|
0818eb4001
|
Merge branch 'dev_common' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_personal_center
|
5 years ago |
|
sunyuchao
|
921fef1788
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
sunyuchao
|
1fd7ddbc38
|
项目库-项目相关人员表添加话题议题标识字段
|
5 years ago |
wangchao
|
0bb740d4ef
|
Merge remote-tracking branch 'origin/dev_group_edit' into dev_temp
|
5 years ago |
|
wangchao
|
fc67e51096
|
组修改审核通过后删除该组信息的缓存
|
5 years ago |
|
sunyuchao
|
614251e3db
|
Merge branch 'dev_oper_login' into dev_temp
|
5 years ago |
|
sunyuchao
|
1427597cdc
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
sunyuchao
|
dcace958e6
|
程序优化
|
5 years ago |
yinzuomei
|
5c4c707802
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
|
5 years ago |
|
yinzuomei
|
0f1ecd8028
|
去除url
|
5 years ago |
|
yinzuomei
|
f56a7adf80
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
yinzuomei
|
03867938dc
|
个人中心-我发起的议题列表-已关闭+一转项目
|
5 years ago |
|
wangchao
|
11c9ba0c07
|
我参与过的话题
|
5 years ago |
|
sunyuchao
|
658430681b
|
Merge branch 'dev_oper_login' into dev
|
5 years ago |
zxc
|
86b03e30a2
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
050791ca6e
|
议题倒序
|
5 years ago |
liushaowen
|
a0f5e58282
|
添加用户建议flyway脚本
|
5 years ago |
|
wangchao
|
c32942d7b0
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
wangchao
|
1d98884381
|
组员列表、入群审核列表返回徽章列表
|
5 years ago |
|
jianjun
|
a2c0eb0ea8
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
|
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 |
|
sunyuchao
|
a10654d1cb
|
修复关于10.27提交代码错误的把历史接口返参dto替换调的问题-PC工作端登陆获取用户基本信息接口
|
5 years ago |
|
jianjun
|
0325d7df2e
|
统计公众参与 添加判断，存在 网格Id不存在的情况
|
5 years ago |
wxz
|
76c94e1832
|
修改：个人中心-我的话题列表接口，返回值增加releaseGridName字段
|
5 years ago |
|
wxz
|
b37e75b312
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
wxz
|
ad947e9d4a
|
Merge branch 'dev_personal_center' into dev_temp
|
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 |
|
liushaowen
|
d8ea7df7c6
|
Merge branch 'dev_temp' of http://121.42.41.42:7070/r/epmet-cloud into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
|
5 years ago |
|
liushaowen
|
d67b72dcdd
|
Merge branch 'dev_personal_center' into dev_temp
# Conflicts:
# 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/mapper/group/ResiGroupDao.xml
|
5 years ago |
|
wxz
|
81111182fc
|
Merge branch 'dev_personal_center' into dev_temp
|
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
|
9946c80b54
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
zxc
|
6a48054f6d
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
# Conflicts:
# 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/mapper/group/ResiGroupDao.xml
|
5 years ago |
|
wxz
|
1173d99d8a
|
Merge branch 'dev_gateway_whitelist' into dev_temp
|
5 years ago |
|
wxz
|
fa7143f955
|
修改：gateway新增内部接口url白名单
|
5 years ago |
|
zxc
|
e7b30034b0
|
我发起的议题-表决中
|
5 years ago |
|
liushaowen
|
d8bd2801ca
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
liushaowen
|
f5bb49acfe
|
添加dto
|
5 years ago |
