jianjun
|
7d4f093205
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
1b04715bd1
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
1d67fa09df
|
看不出来 只能日志了
|
4 years ago |
|
jianjun
|
e2c1b4c89f
|
让stats 轻装上阵 准备计算
|
4 years ago |
|
jianjun
|
9823f4948e
|
例行工作次数统计 暂时先按照创建时间 全量添加
|
4 years ago |
wangxianzhang
|
fe733f99f9
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
wangxianzhang
|
a2ef3a9668
|
修改：
1.查询志愿者列表agencyId问题
|
4 years ago |
zxc
|
7c7000af62
|
project升级
|
4 years ago |
|
zxc
|
7d1852d6b5
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
d07d2264b9
|
Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into dev
|
4 years ago |
|
zxc
|
b83d07bfb3
|
bug之英文:
|
4 years ago |
|
zxc
|
52a2685bad
|
bug之:
|
4 years ago |
sunyuchao
|
ad84e17284
|
bug修改
|
4 years ago |
|
zxc
|
a9104ed36d
|
bug
|
4 years ago |
|
jianjun
|
e8396c2f5d
|
网格类型字典
|
4 years ago |
|
zxc
|
8feac6d00c
|
bug
|
4 years ago |
|
sunyuchao
|
3987c54b03
|
网格类型字典表数据
|
4 years ago |
zhaoqifeng
|
6fb98e11d0
|
社区党建相关bug修改
|
4 years ago |
|
zhaoqifeng
|
fb3d6de8e8
|
社区党建相关bug修改
|
4 years ago |
|
sunyuchao
|
248e615fbc
|
代码优化
|
4 years ago |
|
zxc
|
29047a1caa
|
bug
|
4 years ago |
|
zxc
|
e3ce28750b
|
project-update
|
4 years ago |
|
zxc
|
bbf72ea329
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
53655b0896
|
Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into dev
|
4 years ago |
|
zxc
|
fbfb4709bf
|
bug
|
4 years ago |
|
zxc
|
824167180d
|
emm
|
4 years ago |
|
jianjun
|
ed223fee80
|
项目分布分析
|
4 years ago |
|
jianjun
|
6a0b8c1e0b
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
a2999e2ae6
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
2223cef9b9
|
Merge remote-tracking branch 'remotes/origin/dev_2021_12_30_bug' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
|
4 years ago |
|
wangxianzhang
|
876614fc2c
|
合并dev代码，并且解决冲突
|
4 years ago |
|
zxc
|
b266e8532a
|
项目分布分析
|
4 years ago |
|
wangxianzhang
|
8a8c3cd218
|
Merge branches 'dev' and 'dev_ic_mp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_mp
Conflicts:
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java
epmet-module/epmet-job/epmet-job-server/pom.xml
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
|
4 years ago |
yinzuomei
|
70db8dec17
|
没毛病，就是返回null,可能是当时约定好的吧
|
4 years ago |
|
wangxianzhang
|
4b29544c47
|
版本升级
|
4 years ago |
|
wangxianzhang
|
1f021979da
|
Merge branch 'dev'
|
4 years ago |
|
wangxianzhang
|
05b8d96bec
|
Merge branches 'dev' and 'wxz_dim_sync' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_dim_sync
|
4 years ago |
|
zxc
|
402c06b261
|
字段名添加【小程序预约列表】
|
4 years ago |
|
jianjun
|
f6089aee98
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
aaadd823e1
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
3b0e38ad15
|
Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
6bc8ce2dbe
|
Merge remote-tracking branch 'origin/dev_hotfix' into dev_hotfix
|
4 years ago |
|
jianjun
|
e99b34a4d1
|
存个半小时吧 让他连续点击时 别再造我的数据库了
|
4 years ago |
|
wangxianzhang
|
8e94b07303
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
wangxianzhang
|
8cbbe9776d
|
版本升级
|
4 years ago |
|
jianjun
|
5af5c73b0e
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
8cd0a156ba
|
查询优化 分页 up
|
4 years ago |
|
wangxianzhang
|
f2de67f574
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
cc4c666b4f
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
wangxianzhang
|
55607a1118
|
Merge branch 'dev_hotfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
