zxc
|
2c557df98f
|
Merge remote-tracking branch 'origin/dev_patrol_stats' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
|
4 years ago |
|
zxc
|
58eb90af5d
|
修改巡查时间格式
|
4 years ago |
jianjun
|
d633cf201d
|
网格员巡查统计脚本添加
|
4 years ago |
|
jianjun
|
ab0fe9ddad
|
网格员巡查统计初始化几重新计算代码
|
4 years ago |
|
zxc
|
b2a4a1285e
|
Merge remote-tracking branch 'origin/dev_patrol_stats' into develop
|
4 years ago |
|
zxc
|
ded4170c88
|
..
|
4 years ago |
wxz
|
59479f8655
|
Merge branches 'develop' and 'wxz_permission_async' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
yinzuomei
|
41e813e8c9
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
wxz
|
4784673284
|
修复：FieldMetaObject#getCustomerId方法，增加空字符串的判断
|
4 years ago |
|
yinzuomei
|
b98e62e717
|
projectCreateTime
|
4 years ago |
|
zxc
|
981f80d6a3
|
Merge remote-tracking branch 'origin/dev_patrol_stats' into develop
|
4 years ago |
|
zxc
|
3985d96e5d
|
巡查
|
4 years ago |
|
jianjun
|
05b972456d
|
初始化数据代码
|
4 years ago |
|
wxz
|
4929d451cc
|
Merge branches 'dev' and 'wxz_permission_async' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_permission_async
|
4 years ago |
|
zxc
|
003aea28c4
|
Merge remote-tracking branch 'origin/dev_patrol_stats' into develop
|
4 years ago |
|
zxc
|
ac97acf5b2
|
巡查期间立项数
|
4 years ago |
|
yinzuomei
|
c52554adf3
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
b8c9aeab53
|
指数查询添加customerId
|
4 years ago |
zhaoqifeng
|
66bb25506a
|
sql脚本
|
4 years ago |
|
wxz
|
8d4e39a0a9
|
Merge branches 'develop' and 'wxz_permission_async' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wxz
|
8c66070b63
|
删除：无效的flyway脚本
|
4 years ago |
|
wxz
|
2b7d44b231
|
修改：将报错的0.0.14 flyway脚本改为select 0;跳过报错
|
4 years ago |
|
wxz
|
40fe2c18b8
|
修复：给所有客户的某角色分配权限，customerid填充为操作人的customerid的bug
|
4 years ago |
sunyuchao
|
5f959dd33f
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
|
sunyuchao
|
f839e688df
|
Merge branch 'dev_data_fusion' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_fusion
|
4 years ago |
|
sunyuchao
|
1840167103
|
bug修改
|
4 years ago |
|
yinzuomei
|
29fdc531eb
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
zxc
|
6cc8d652af
|
rizhi
|
4 years ago |
|
sunyuchao
|
0db02bdeea
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
|
sunyuchao
|
585f053fbd
|
程序逻辑调整
|
4 years ago |
|
sunyuchao
|
0e16f45385
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
|
sunyuchao
|
33470b0c1f
|
基础数据查询调整，按areacode查数据时添加客户Id的查询条件
|
4 years ago |
|
sunyuchao
|
ef57897c80
|
Merge branch 'dev_oper_role' into develop
|
4 years ago |
|
sunyuchao
|
ae1fa066d5
|
客户权限列表排序问题
|
4 years ago |
|
yinzuomei
|
064139e7b1
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
24f59a001a
|
project/mynextagency-multic接口修改
|
4 years ago |
|
yinzuomei
|
e9a7103705
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
5990c042f2
|
project/mynextagency-multic接口修改
|
4 years ago |
|
zxc
|
6af39126be
|
巡查统计表文件上传
|
4 years ago |
|
yinzuomei
|
f525930e26
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
eb1e19a13a
|
agencydetail-multic
|
4 years ago |
|
yinzuomei
|
735f561ce3
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
936abfb317
|
agencydetail-multic
|
4 years ago |
|
jianjun
|
cae7da256e
|
初始化数据代码暂存
|
4 years ago |
|
zhaoqifeng
|
90ed6aefac
|
响应率统计修改
|
4 years ago |
|
sunyuchao
|
c4362e7375
|
Merge branch 'dev_oper_role' into develop
|
4 years ago |
|
sunyuchao
|
aa264d65bb
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
|
sunyuchao
|
b072ff61e8
|
Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
|
4 years ago |
|
sunyuchao
|
3abf215554
|
入参集合判空
|
4 years ago |
|
yinzuomei
|
259baabf5a
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
