yinzuomei
|
f1ef68f92b
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
75f9c6b4f1
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
4 years ago |
zxc
|
9d795947c8
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
4 years ago |
|
zxc
|
e6da73bb66
|
居民预约
|
4 years ago |
|
yinzuomei
|
33946fcd46
|
Merge branches 'dev' and 'dev_ic_mp' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_mp
Conflicts:
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
|
4 years ago |
|
zxc
|
a9f45dd6d9
|
Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into develop
|
4 years ago |
|
zxc
|
426b315382
|
居民热议饼图添加查询条件
|
4 years ago |
|
zxc
|
bdb7e50fa1
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
zxc
|
c2de6caf76
|
小程序预约
|
4 years ago |
jianjun
|
3c9761abe5
|
Merge remote-tracking branch 'remotes/origin/dev_for_shibei_customerid' into dev
|
4 years ago |
zhaoqifeng
|
8c25b05f00
|
Merge branch 'dev_2021_12_30_bug' into develop
|
4 years ago |
|
yinzuomei
|
b27344e6b7
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
zhaoqifeng
|
be7521315e
|
社区党建相关bug修改
|
4 years ago |
|
yinzuomei
|
222df3ec96
|
服务措施分析导出
|
4 years ago |
|
yinzuomei
|
ca9eb64891
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
71475fc682
|
服务措施分析，分页查询
|
4 years ago |
|
zxc
|
747e1030b6
|
Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into develop
|
4 years ago |
|
zxc
|
85289f3115
|
字段名
|
4 years ago |
|
jianjun
|
4d85295a03
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
e37ce4f680
|
Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
cc7bd3e2d2
|
Merge remote-tracking branch 'origin/dev_hotfix' into dev_hotfix
|
4 years ago |
|
jianjun
|
4f52fcc85d
|
存他个 24小时 给我点时间 up
|
4 years ago |
wangxianzhang
|
72f59aa17f
|
Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
8602ee9b21
|
Merge remote-tracking branch 'origin/dev_hotfix' into dev_hotfix
|
4 years ago |
|
wangxianzhang
|
bcdb455099
|
fix
|
4 years ago |
|
jianjun
|
00eb56079b
|
Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
2ffe9cf026
|
Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_hotfix
|
4 years ago |
|
jianjun
|
f1afa6550d
|
存他个 24小时 给我点时间
|
4 years ago |
|
wangxianzhang
|
a91ae70352
|
Merge branch 'dev_hotfix' into dev
|
4 years ago |
|
wangxianzhang
|
bc242593ce
|
优化志愿者分布查询接口
|
4 years ago |
|
zxc
|
2f17a20a3e
|
Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into dev
|
4 years ago |
|
zxc
|
5d17794a22
|
Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into develop
|
4 years ago |
|
zxc
|
cc290ca05e
|
拆分sql
|
4 years ago |
|
zxc
|
0008cb580f
|
Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into develop
|
4 years ago |
|
zxc
|
d33c784105
|
拆分sql
|
4 years ago |
|
jianjun
|
a278b14382
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
217586b9e4
|
Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
cc08e57c94
|
注掉这个挨千刀的
|
4 years ago |
|
wangxianzhang
|
f7fbb56030
|
Merge branch 'dev_hotfix' into dev
|
4 years ago |
|
wangxianzhang
|
1eafea80f0
|
Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_hotfix
|
4 years ago |
|
wangxianzhang
|
d7b446e9d1
|
修改：优化志愿者分布查询接口
|
4 years ago |
|
jianjun
|
b57d864a2a
|
Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
4d9404affd
|
巡查的延迟1s 消费
|
4 years ago |
|
zxc
|
6522b20463
|
Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into develop
|
4 years ago |
|
zxc
|
a7c4bd9031
|
拆分sql
|
4 years ago |
|
jianjun
|
1ffedc4f41
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
2272c4445d
|
Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
72c8e0ea25
|
临时解决方案 组织树 先缓存
|
4 years ago |
|
jianjun
|
22474ae651
|
临时解决方案 组织树 先缓存
|
4 years ago |
|
jianjun
|
a9a5826695
|
Revert "临时解决方案 组织树 先缓存"
This reverts commit d69fd238
|
4 years ago |
