sunyuchao
|
eaacc3ca9d
|
补录数据
|
4 years ago |
|
sunyuchao
|
3b73fefaa5
|
Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
|
4 years ago |
|
sunyuchao
|
4f0f60c63b
|
代码调整
|
4 years ago |
zhaoqifeng
|
440024cb0b
|
Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
|
4 years ago |
|
sunyuchao
|
6c108a5441
|
漏提代码
|
4 years ago |
|
zhaoqifeng
|
296c8916c0
|
screen_project_data添加上报人ID
|
4 years ago |
|
sunyuchao
|
ccf4cab5bf
|
Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
|
4 years ago |
|
sunyuchao
|
e51f508864
|
更多-巡查列表接口逻辑调整
|
4 years ago |
|
zhaoqifeng
|
20291e71a4
|
screen_project_data添加上报人ID
|
4 years ago |
wxz
|
7e4b26eda7
|
版本升级
|
4 years ago |
|
wxz
|
8e97e5e952
|
Merge branch 'dev'
|
4 years ago |
|
wxz
|
fb327ddd54
|
Merge branch 'dev_wxz_gateway_access' into dev
|
4 years ago |
|
wxz
|
68b2ca86bd
|
Merge branch 'dev' into dev_wxz_gateway_access
|
4 years ago |
|
wxz
|
a2f7084122
|
修复：用户的登录缓存删除之后，继续操作，提示无权限的问题
|
4 years ago |
|
zhaoqifeng
|
17819742d1
|
网格员巡查功能接口
|
4 years ago |
jianjun
|
10b41fed0d
|
上线 user agg report
|
4 years ago |
|
jianjun
|
312b7386f2
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
zhaoqifeng
|
330e6cd4d0
|
网格员巡查功能接口
|
4 years ago |
|
jianjun
|
b3cbdf09db
|
Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
|
4 years ago |
|
jianjun
|
14b27f8940
|
采用lambda方式 创建sql
|
4 years ago |
|
jianjun
|
84101cf776
|
巡查按钮权限
|
4 years ago |
|
jianjun
|
a48fafbdd9
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
zhaoqifeng
|
7fc4ffbe2d
|
网格员巡查功能接口权限
|
4 years ago |
zxc
|
d7b286457f
|
注释添加
|
4 years ago |
|
jianjun
|
baa3bff6e4
|
巡查按钮权限 添加
|
4 years ago |
|
sunyuchao
|
03ceb87cee
|
更多-巡查列表接口添加权限
|
4 years ago |
|
wxz
|
d1bd137eb7
|
Merge branch 'dev' into dev_log
|
4 years ago |
|
jianjun
|
0a870f6a93
|
修改 权限模块及bug 上线
|
4 years ago |
|
jianjun
|
ed93d3a6b6
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
a831a8f01e
|
修改 权限模块
|
4 years ago |
|
zhaoqifeng
|
62fac84c19
|
网格员巡查功能接口
|
4 years ago |
|
zhaoqifeng
|
cb20477209
|
网格员巡查功能接口
|
4 years ago |
|
zhaoqifeng
|
5231b71caa
|
网格员巡查功能接口
|
4 years ago |
|
wxz
|
cf238e3ac2
|
日志列增加customer_id列
日志查询接口，改为模糊查询
|
4 years ago |
|
wxz
|
de9906547a
|
Merge branch 'dev' into dev_log
# Conflicts:
# epmet-admin/epmet-admin-server/pom.xml
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
# epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
|
4 years ago |
|
jianjun
|
f3c19a3eef
|
点位-上线
|
4 years ago |
|
jianjun
|
eeffbb2b31
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
550bdfd088
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
zxc
|
3a3a2caba4
|
网格员轨迹查询 经纬度修改
|
4 years ago |
|
wxz
|
865c1c302d
|
将开发环境原有的namespace替换为新开发环境的namespace
|
4 years ago |
|
wxz
|
d91fa2bc84
|
将130相关的配置替换为140
|
4 years ago |
|
jianjun
|
c2dae80765
|
加强判断-上线
|
4 years ago |
|
jianjun
|
47b342aa2a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
8bdfb15015
|
Merge remote-tracking branch 'remotes/origin/dev_grid_patrol' into dev
|
4 years ago |
|
jianjun
|
6b3f6975f5
|
Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
|
4 years ago |
|
jianjun
|
b3bc252be7
|
加强判断
|
4 years ago |
|
jianjun
|
afa645658a
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
sunyuchao
|
4fc06e20b0
|
sql脚本删除
|
4 years ago |
|
jianjun
|
e024ed6dd2
|
巡查 上线 配合大屏显示 重新上 脚本错误
|
4 years ago |
|
jianjun
|
4cb5d9ca96
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
