yinzuomei
|
e5db510163
|
放行
|
4 years ago |
zxc
|
97e726421a
|
qrcode
|
4 years ago |
|
zxc
|
e898c51702
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into develop
|
4 years ago |
|
zxc
|
2a144cd01f
|
更新字段修改
|
4 years ago |
wangxianzhang
|
6ba5fd4009
|
修复编译失败问题
|
4 years ago |
|
wangxianzhang
|
0b1040d6ba
|
去掉无用日志
|
4 years ago |
|
wangxianzhang
|
09f4d9403b
|
Merge branch 'wxz_thirdtest' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
Conflicts:
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
|
4 years ago |
jianjun
|
dae217f2fd
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
65ecc910b2
|
Merge remote-tracking branch 'remotes/origin/dev_abandon_grid' into develop
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java
|
4 years ago |
|
jianjun
|
20a3d4c78c
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid
|
4 years ago |
|
jianjun
|
7cec5ec2e2
|
删除网格访问记录-废弃网格时
|
4 years ago |
|
yinzuomei
|
97a30283e8
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into develop
|
4 years ago |
|
yinzuomei
|
0dc2f58ea0
|
先放开
|
4 years ago |
|
yinzuomei
|
9b0d2eb78c
|
user_reg_grid_change_rec
|
4 years ago |
|
yinzuomei
|
c8b0edb0ef
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into develop
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java
|
4 years ago |
|
yinzuomei
|
e20910681e
|
user_reg_grid_change_rec
|
4 years ago |
|
zxc
|
c540404bf6
|
commonFeign删除获取网格方法
|
4 years ago |
|
wangxianzhang
|
0f93e4b84b
|
Merge branch 'wxz_thirdtest' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
2bbdc81cf8
|
-
|
4 years ago |
|
wangxianzhang
|
5f0868e7d8
|
fastjson版本升级到1.2.79
|
4 years ago |
|
wangxianzhang
|
32320418d3
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_thirdtest
|
4 years ago |
|
yinzuomei
|
5b9b612bb5
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into develop
|
4 years ago |
|
zxc
|
90c1207acc
|
根据userId查询注册网格ID添加筛选条件
|
4 years ago |
|
wangxianzhang
|
eab547db29
|
Merge branch 'wxz_templatedownload' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
5fd50363e7
|
Merge branch 'dev_warn_notice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
Conflicts:
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
|
4 years ago |
|
yinzuomei
|
e7b3074ebe
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
f7876ca4ca
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into develop
|
4 years ago |
|
yinzuomei
|
d1a24727d4
|
时间
|
4 years ago |
|
jianjun
|
ed0dff9744
|
Merge remote-tracking branch 'origin/release_temp' into 主线测试
|
4 years ago |
|
jianjun
|
c16c35522e
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
4 years ago |
|
jianjun
|
8b7fc49bb7
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
9e8b815ee4
|
Merge branch 'dev_warn_notice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
eb58ead3f1
|
固定宽度
|
4 years ago |
|
wangxianzhang
|
bd9857c150
|
新增
1.第三方平台接入示例
|
4 years ago |
|
yinzuomei
|
9d3ae62187
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into develop
|
4 years ago |
|
yinzuomei
|
7f4123c5cf
|
merge
|
4 years ago |
|
yinzuomei
|
af1dacd619
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
|
4 years ago |
|
yinzuomei
|
bdc89ab262
|
updatedTime
|
4 years ago |
|
jianjun
|
6c38e90e07
|
Merge branch 'dev_abandon_grid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
110a133587
|
错误错误
|
4 years ago |
|
jianjun
|
bfb6ee5bd8
|
Merge remote-tracking branch 'remotes/origin/dev_abandon_grid' into develop
|
4 years ago |
|
jianjun
|
ae656cc94b
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_abandon_grid
|
4 years ago |
|
jianjun
|
95efbd3099
|
Merge branch 'dev_abandon_grid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
b0a480d791
|
fallback
|
4 years ago |
|
jianjun
|
f56caf404f
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
adcc75d5f2
|
Merge branch 'dev_abandon_grid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
3e8b7cbb0e
|
fallback
|
4 years ago |
|
zxc
|
3b22ad3e25
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into develop
|
4 years ago |
|
zxc
|
cd4cddd617
|
哈哈
|
4 years ago |
|
jianjun
|
10e618df76
|
Merge branch 'dev_abandon_grid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
