sunyuchao
|
725b44149b
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
f6bffa9a7c
|
Merge branch 'dev_project_branch' into dev
|
5 years ago |
zxc
|
15defc2558
|
sql修改
|
5 years ago |
|
sunyuchao
|
279d2e6919
|
Merge branch 'dev_project_branch' into dev
|
5 years ago |
|
sunyuchao
|
241392bf3b
|
居民热议-已转项目列表排序问题
|
5 years ago |
|
zxc
|
e588e8b193
|
新表对应生成文件上传
|
5 years ago |
wxz
|
7f24b54ec1
|
版本升级
|
5 years ago |
|
wxz
|
dba9756aef
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
7bd7795363
|
Merge branch 'dev_project_branch' into dev
|
5 years ago |
|
wxz
|
54ef02d917
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
zxc
|
99b13395a4
|
生产地址修改
|
5 years ago |
|
sunyuchao
|
cbf3003503
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
3f93adb75c
|
少包
|
5 years ago |
|
sunyuchao
|
ce79ec7ec0
|
Merge branch 'dev_graceful_shutdown' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
|
5 years ago |
|
wxz
|
0acb7dd8fb
|
Merge remote-tracking branch 'origin/dev_graceful_shutdown' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
|
5 years ago |
|
sunyuchao
|
ccb5c536da
|
项目附件、议题项目内容汇聚发布生产
|
5 years ago |
|
sunyuchao
|
c7f2587b45
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
5ba1f09ff2
|
Merge branch 'dev_project_branch' into dev
|
5 years ago |
|
zxc
|
8e7277bdc0
|
已转项目修改排序
|
5 years ago |
|
sunyuchao
|
2a6cdcab09
|
数据改版先进支部接口调整、新消息订阅third服务
|
5 years ago |
|
sunyuchao
|
2657984b0f
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
32a59e5a44
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
liushaowen
|
91b20d3821
|
模板列表
|
5 years ago |
|
sunyuchao
|
41b14f9a72
|
数据模块-先进支部排行接口调整 名称为组织-网格
|
5 years ago |
yinzuomei
|
734b83ce6d
|
monthindexanalysis/barchart接口修改 +1
|
5 years ago |
|
yinzuomei
|
a87e9dd2dd
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
d357d59631
|
monthindexanalysis/barchart，横坐标修改
|
5 years ago |
|
yinzuomei
|
53f04a4985
|
monthindexanalysis/barchart接口修改 +1
|
5 years ago |
|
yinzuomei
|
4fff997a0a
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
401b8a3d1c
|
monthindexanalysis/barchart接口修改
|
5 years ago |
|
yinzuomei
|
c95f783f74
|
report->60
|
5 years ago |
|
yinzuomei
|
aba84c6284
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
54eb1ebac0
|
指数查询接口修改
|
5 years ago |
|
zxc
|
af9fce892f
|
议题-全部修改
|
5 years ago |
|
zxc
|
e9639888f2
|
待审核添加 issueApplicationId
|
5 years ago |
|
zxc
|
1061683468
|
已转项目添加 issueTitle
|
5 years ago |
|
zxc
|
30f87ce08c
|
议题总数修改，议题审核被拒绝修改
|
5 years ago |
|
zxc
|
4921fda5bc
|
Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch
|
5 years ago |
|
zxc
|
857cb7137f
|
议题总数修改
|
5 years ago |
|
wxz
|
918162bafd
|
Merge branch 'dev_oss_private' into dev_project_branch
|
5 years ago |
|
wxz
|
b779d862b7
|
修改：修改错误
|
5 years ago |
|
wxz
|
41a98879a4
|
修改：补充
|
5 years ago |
|
zxc
|
617f742239
|
审核ID添加
|
5 years ago |
|
wxz
|
e32d873ef2
|
Merge branch 'dev_oss_private' into dev_project_branch
|
5 years ago |
|
wxz
|
b9057df5c7
|
修改：在前端无法做oss私有链接适配的情况下，暂且使用/internal目录来区分私有文件
|
5 years ago |
|
yinzuomei
|
3a4a87987c
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
f7930cec33
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
5 years ago |
zhaoqifeng
|
e7a967a75f
|
消息订阅返回错误修改
|
5 years ago |
|
wxz
|
d563968737
|
修改：使用阿里云私有bucket存储项目附件
|
5 years ago |
|
wxz
|
2aca0a1c3c
|
Merge branch 'dev_oss_private' into dev_project_branch
# Conflicts:
# epmet-gateway/pom.xml
# epmet-gateway/src/main/resources/bootstrap.yml
# epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java
# epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
|
5 years ago |
