zhaoqifeng
|
0ac489e944
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
667325333a
|
Merge branch 'dev_memo' into develop
|
4 years ago |
|
zhaoqifeng
|
7dd89addb4
|
更新时， 提醒时间可以为空
|
4 years ago |
sunyuchao
|
95902f6307
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
be0b8fee22
|
Merge branch 'dev_memo' into develop
|
4 years ago |
|
sunyuchao
|
bd768e2535
|
删除修改
|
4 years ago |
|
zhaoqifeng
|
f258c7c449
|
更新时， 提醒时间可以为空
|
4 years ago |
|
zhaoqifeng
|
e54138e1b7
|
Merge branch 'dev_memo' into develop
|
4 years ago |
|
zhaoqifeng
|
0fcb013795
|
更新时间
|
4 years ago |
yinzuomei
|
35ebf6ed00
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
4 years ago |
|
yinzuomei
|
6777d406cd
|
Merge remote-tracking branch 'origin/dev_qr_code' into dev_qr_code
|
4 years ago |
|
yinzuomei
|
73dbbecbef
|
内部
|
4 years ago |
jianjun
|
b12617cacf
|
二维码地址组成描述
|
4 years ago |
zxc
|
65c766dd4e
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
fd65dc8b78
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
4 years ago |
|
jianjun
|
97e577187b
|
小区二维码生成 pom
|
4 years ago |
|
yinzuomei
|
80efeaadf3
|
内部
|
4 years ago |
|
jianjun
|
635d5a4c08
|
小区二维码生成 con
|
4 years ago |
|
jianjun
|
e03196350f
|
Merge remote-tracking branch 'origin/dev_qr_code' into dev_qr_code
|
4 years ago |
|
jianjun
|
2cb82878fd
|
小区二维码生成
|
4 years ago |
|
yinzuomei
|
3f4e8a95b0
|
多了吧
|
4 years ago |
|
yinzuomei
|
61c5d7c962
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
4 years ago |
|
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 |
