yinzuomei
|
df2b22cf5a
|
服务升级
|
5 years ago |
wangchao
|
60d4b76bf4
|
Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
# Conflicts:
# epmet-gateway/pom.xml
|
5 years ago |
|
wangchao
|
dfdc7ea8de
|
修改群组服务的execution表达式
|
5 years ago |
zxc
|
470fabcfc4
|
controller添加传参判断，议题处理进展添加权限注解
|
5 years ago |
|
yinzuomei
|
ed4a902f71
|
本机url
|
5 years ago |
|
yinzuomei
|
80b6d2422d
|
Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
|
5 years ago |
|
yinzuomei
|
a8d2f58e5d
|
reddot接口修改
|
5 years ago |
zhaoqifeng
|
71f81bf847
|
项目列表修改
|
5 years ago |
|
zxc
|
7fef4da39f
|
议题处理进展、表决中支持、反对数量修改
|
5 years ago |
|
wangchao
|
e710bc978f
|
issue表建表语句时间类型由date改成datetime
|
5 years ago |
|
yinzuomei
|
aef0287d6d
|
bug修改
|
5 years ago |
|
yinzuomei
|
712c8d2266
|
待办红点提醒
|
5 years ago |
sunyuchao
|
471cc04144
|
Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
|
5 years ago |
|
sunyuchao
|
245f451676
|
议题管理-议题转项目
|
5 years ago |
|
yinzuomei
|
4a5a377c43
|
Merge branches 'dev' and 'dev_issue_project' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_project
|
5 years ago |
|
yinzuomei
|
0ccd5515fc
|
getMyGrids接口修改，resigroup 缓存库db1
|
5 years ago |
|
yinzuomei
|
0c808ae5aa
|
getMyGrids接口修改，resigroup 缓存库db1,gateway修改
|
5 years ago |
|
wangchao
|
a9348c2d75
|
Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
# Conflicts:
# epmet-module/gov-issue/gov-issue-server/pom.xml
# 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/controller/IssueManageController.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-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
# epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
# epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
# epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
|
5 years ago |
|
wangchao
|
9ed7b7c02b
|
群成员缓存加上手机号字段、议题相关接口（居民端、政府端）
|
5 years ago |
|
yinzuomei
|
7b031417bf
|
升级服务发布dev
|
5 years ago |
|
yinzuomei
|
9ee87936e7
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
yinzuomei
|
d226cbbc14
|
居民端获取首页配置(/resi/guide/stranger/getgridhome),政府端(gov/mine/agency/getlatestgrid)接口bug修改
|
5 years ago |
wxz
|
958904fa99
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
wxz
|
f62794630e
|
1.新增日志切面，打印日志，拦截异常
2.停用RenExceptionHandler
|
5 years ago |
|
yinzuomei
|
2f628bbd8b
|
升级服务发布dev
|
5 years ago |
|
yinzuomei
|
7b88d847f2
|
Merge remote-tracking branch 'origin/dev_issue_project' into dev
|
5 years ago |
|
yinzuomei
|
67027f3354
|
getlatestgridinfo接口修改
|
5 years ago |
|
wxz
|
987f248d13
|
1.compose配置文件错误
|
5 years ago |
|
wxz
|
4e050ac8d1
|
1.分支切换到release
|
5 years ago |
|
yinzuomei
|
fea99e9668
|
Merge branches 'dev' and 'dev_issue_project' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_project
|
5 years ago |
|
sunyuchao
|
17b26d0786
|
Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
|
5 years ago |
|
sunyuchao
|
9b42a90264
|
议题管理、项目跟踪-人员选择
|
5 years ago |
|
zhaoqifeng
|
d470277f96
|
项目表添加客户ID
|
5 years ago |
|
yinzuomei
|
9c3790e16a
|
升级服务发布dev
|
5 years ago |
|
zhaoqifeng
|
17de9a66a5
|
项目相关接口
|
5 years ago |
|
yinzuomei
|
46caf75ca0
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
yinzuomei
|
f89f4fca5c
|
去除dev-local配置
|
5 years ago |
|
wxz
|
0e68703ffa
|
1.去掉负载均衡配置(有问题)
|
5 years ago |
|
yinzuomei
|
1ecc5cedac
|
Merge remote-tracking branch 'origin/dev_issue_project' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/pom.xml
|
5 years ago |
|
yinzuomei
|
26c0138af8
|
url修改
|
5 years ago |
|
yinzuomei
|
7a57d7b018
|
Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
|
5 years ago |
|
yinzuomei
|
f0350bfea9
|
修改异常抛出
|
5 years ago |
|
wxz
|
505b70bac4
|
1.增加test测试环境compose文件
|
5 years ago |
|
wangchao
|
7d78a85d2f
|
Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
# Conflicts:
# 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/service/IssueService.java
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
# 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/java/com/epmet/modules/topic/controller/ResiTopicController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
5 years ago |
|
wangchao
|
b294d386b1
|
群组相关接口、议题相关接口
|
5 years ago |
|
zxc
|
06f4144e13
|
权限注解添加
|
5 years ago |
|
wxz
|
8fcba0f981
|
1.升级，修复compose配置文件错误
|
5 years ago |
|
wxz
|
6dc32fb867
|
1.升级，修复compose配置文件错误
|
5 years ago |
|
wxz
|
f074596218
|
1.升级，创建130dev环境
|
5 years ago |
|
wxz
|
df9fc4ac93
|
1.升级，创建130dev环境
|
5 years ago |
