zxc
|
b2249ac8fd
|
街道相关优化
|
5 years ago |
sunyuchao
|
d3dc641866
|
Merge branch 'release'
|
5 years ago |
|
sunyuchao
|
314176cf81
|
Merge branch 'dev' into release
|
5 years ago |
|
zxc
|
6a37525f24
|
街道相关
|
5 years ago |
|
sunyuchao
|
2119a0847a
|
Merge branch 'dev_staff_transfer' into dev
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
|
5 years ago |
jianjun
|
7abb5bf5bd
|
修改数据库
|
5 years ago |
|
jianjun
|
3266e3d7d3
|
修改数据库
|
5 years ago |
|
jianjun
|
df0c5ae450
|
部署statis
|
5 years ago |
|
jianjun
|
1a40e529a1
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
65995689cf
|
修改数据库
|
5 years ago |
|
jianjun
|
2888963bb0
|
修改数据库
|
5 years ago |
|
jianjun
|
be4cc31ecb
|
修改错误脚本
|
5 years ago |
|
sunyuchao
|
bfe24cc228
|
Merge branch 'dev_plugins' into dev
# Conflicts:
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java
|
5 years ago |
wxz
|
4a6f8bbfd7
|
Merge branch 'dev_externalappauth' into dev
|
5 years ago |
|
jianjun
|
d7a8b9a40b
|
添加flyway文件
|
5 years ago |
|
jianjun
|
fa0dc92dd5
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
87f7b11197
|
添加flyway文件
|
5 years ago |
wangchao
|
ca5fdf4a26
|
data-report +1 -> 61
|
5 years ago |
|
wangchao
|
b459fb67cd
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
zxc
|
c9dabcadaf
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
zxc
|
d31e78978c
|
sql文件
|
5 years ago |
|
wangchao
|
832dcaff6e
|
data-report +1 -> 60
|
5 years ago |
|
wangchao
|
a5dd758ed9
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wangchao
|
874f525436
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
wangchao
|
b62b1aefb3
|
大屏数据接口分页修改
|
5 years ago |
|
jianjun
|
75d227867c
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
7456f6a223
|
添加测试及生产数据库配置文件
|
5 years ago |
|
wxz
|
c9c3a224c5
|
版本升级
|
5 years ago |
|
wxz
|
4fe1aa6b2f
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
wxz
|
fbe00a9b75
|
Merge branch 'dev_footbar' into dev_temp
|
5 years ago |
|
wxz
|
d500323d83
|
修改：flyway脚本版本号修改
|
5 years ago |
|
wxz
|
d65cc6cea2
|
新增：外部应用秘钥重置
|
5 years ago |
|
jianjun
|
5159201f09
|
添加大屏数据库脚本文件
|
5 years ago |
|
wangchao
|
ad77e87f92
|
data-report +1 -> 59
|
5 years ago |
|
wangchao
|
43e64057cd
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
ec29fcc834
|
添加数据库，包移动
|
5 years ago |
|
jianjun
|
abc777a489
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
jianjun
|
f5ffb40bbf
|
错误修改
|
5 years ago |
|
wangchao
|
cbf4295b35
|
mapper修改
|
5 years ago |
|
wangchao
|
87b63b5db8
|
大屏数据接口修改，在没有当月数据时默认查询之前的月份，数据范围：最多向前跨越一年
|
5 years ago |
|
wxz
|
4602c620c2
|
版本升级
|
5 years ago |
|
wxz
|
0658d49dc4
|
Merge branch 'dev_footbar' into dev_temp
|
5 years ago |
|
wxz
|
e29b1d1546
|
删除默认footbar，连带删除所有客户的footbar（生产上不用，测试用）
|
5 years ago |
yinzuomei
|
425f9114e9
|
去掉注解
|
5 years ago |
|
yinzuomei
|
2a0330c055
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
|
5 years ago |
|
yinzuomei
|
3dff6f26e7
|
去掉注解
|
5 years ago |
|
jianjun
|
6f1c491aae
|
添加数据源待测，移动包
|
5 years ago |
|
jianjun
|
e70bdf3680
|
添加数据源待测，移动包
|
5 years ago |
|
wxz
|
34cfbf6db6
|
版本升级
|
5 years ago |
|
wxz
|
41f1cac4fb
|
Merge branch 'dev_footbar' into dev_temp
|
5 years ago |
