wxz
|
253668fbdf
|
Merge branch 'wxz_feign_exception_show' into release_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
|
4 years ago |
|
wxz
|
04173b62b1
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
wxz
|
eb596522fc
|
Merge branch 'wxz_feign_exception_show' into develop
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
|
4 years ago |
jianjun
|
dd09d54fb9
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
edb31e1647
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
4f26773287
|
Merge remote-tracking branch 'remotes/origin/dev_special_subject' into develop
|
4 years ago |
|
jianjun
|
bd6a50f687
|
tag标签对象拷贝方法调整
|
4 years ago |
|
wxz
|
f01b5c568f
|
Merge branches 'dev' and 'wxz_feign_exception_show' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_feign_exception_show
|
4 years ago |
|
wxz
|
2e4b6792da
|
Merge branches 'dev' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
44a8c88d91
|
对象拷贝方法多余
|
4 years ago |
|
wxz
|
ec3a75b263
|
修改：将所有服务的FeignClientFallBack都改为FallBackFactory
|
4 years ago |
yinzuomei
|
5f749ed8fd
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
e9ca549e1b
|
workrecord/ranklist接口修
|
4 years ago |
|
yinzuomei
|
ff3075c201
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
8f4278ef15
|
/data/report/screen/plugins/workrecord/ranklist接口修改
|
4 years ago |
|
jianjun
|
cc95759a4d
|
Merge branch 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
549fb75529
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
a87f4e3ac8
|
Merge remote-tracking branch 'remotes/origin/dev_special_subject' into develop
|
4 years ago |
|
jianjun
|
587eb862a9
|
打印日志错误修改
|
4 years ago |
|
jianjun
|
08ea9ceb44
|
标签颜色适应调整：新加标签随机添加颜色 缓存内添加颜色
|
4 years ago |
|
wxz
|
35b71ce4f0
|
Merge branch 'wxz_thread_var_clean' into release_temp
|
4 years ago |
|
wxz
|
3c365a0e67
|
Merge branch 'wxz_thread_var_clean' into develop
|
4 years ago |
|
wxz
|
2ee48cf6b4
|
修复：gateway去掉webcomponentscan注解
|
4 years ago |
|
wxz
|
a893bbc466
|
Merge branches 'dev' and 'wxz_feign_exception_show' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_feign_exception_show
|
4 years ago |
zhaoqifeng
|
e3edba7bed
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
d088551ed8
|
Merge branch 'dev_special_subject' into develop
|
4 years ago |
|
zhaoqifeng
|
47f89e3593
|
专题管理-热门标签
|
4 years ago |
|
yinzuomei
|
e57ecdb874
|
专题新增3个权限key
|
4 years ago |
|
wxz
|
a232933c4c
|
Merge branch 'wxz_thread_var_clean' into release_temp
|
4 years ago |
|
wxz
|
0aaecd1d0e
|
Merge branch 'wxz_thread_var_clean' into develop
|
4 years ago |
|
wxz
|
323eafcca5
|
新增：GlobalFilter，tomcat容器级别，用于ThreadLocal变量残留清除
|
4 years ago |
|
yinzuomei
|
abec5de75d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
27718028cc
|
【专题管理】已有专题列表返参增加tagColor
|
4 years ago |
|
jianjun
|
d435478c95
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
ae73c29e0b
|
Merge remote-tracking branch 'remotes/origin/dev_special_subject' into develop
|
4 years ago |
|
jianjun
|
927dadd6d2
|
标签颜色脚本
|
4 years ago |
|
yinzuomei
|
0b55deae22
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
325d2a7181
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
7fef7351b8
|
/resi/guide/stranger/publiclocationgridlist居民端去其他网格看看,限制customer_grid.SYNC_FLAG='1'
|
4 years ago |
|
yinzuomei
|
f3b3f19a89
|
/resi/mine/mygrid/allgrids居民端获取用户访问过的网格,限制customer_grid.SYNC_FLAG='1'
|
4 years ago |
sunyuchao
|
243b2d165b
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
wxz
|
d485998266
|
Merge branch 'dev' into develop
|
4 years ago |
|
wxz
|
43ecbaab7d
|
Merge branch 'dev' into release_temp
|
4 years ago |
|
wxz
|
6019fd9122
|
修复：SQL语法漏洞
|
4 years ago |
|
sunyuchao
|
a7bd8d1786
|
Merge branch 'dev_special_subject' into develop
|
4 years ago |
|
sunyuchao
|
41a5d1837f
|
Merge remote-tracking branch 'origin/dev_special_subject' into dev_special_subject
|
4 years ago |
|
sunyuchao
|
bcccdc79fe
|
测试
|
4 years ago |
|
yinzuomei
|
fcd51e1018
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
yinzuomei
|
9d89d35a6f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
zxc
|
6f58e3565e
|
Merge remote-tracking branch 'origin/dev_special_subject' into develop
|
4 years ago |
