sunyuchao
|
074645cbaf
|
Merge branch 'dev_staff_info' into develop
|
5 years ago |
|
sunyuchao
|
23936ab743
|
组织内有单位领导标签的人排在前面，网格内有网格长标签的人排在前面，部门内有部门领导标签的人排在前面，相同职位及其他职位按创建顺序排序
|
5 years ago |
|
sunyuchao
|
8aded069a9
|
Merge branch 'develop' into release_temp
|
5 years ago |
|
sunyuchao
|
b27cf03db1
|
Merge branch 'dev_staff_info' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
# epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
|
5 years ago |
jianjun
|
182dd06c66
|
差值 差值 代码微调
|
5 years ago |
|
jianjun
|
b538a3c5d1
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
a574ef5683
|
差值 差值 代码微调
|
5 years ago |
|
jianjun
|
7e1a228191
|
差值 差值
|
5 years ago |
|
sunyuchao
|
b1c45ef558
|
sql优化
|
5 years ago |
|
jianjun
|
6e41c8f4a9
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_staff_info
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
|
5 years ago |
|
jianjun
|
b06a621c1a
|
。。。
|
5 years ago |
|
jianjun
|
e513dd925e
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
59f134ef54
|
。。。
|
5 years ago |
|
jianjun
|
882874e5ad
|
。。。
|
5 years ago |
|
jianjun
|
0528034032
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
65d8cbcd19
|
倒序
|
5 years ago |
|
jianjun
|
9a71700c6c
|
再次修改 上线agg
|
5 years ago |
|
jianjun
|
abd72fab36
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
da97cb9149
|
修改工作实况日期bug agg 上线
|
5 years ago |
|
jianjun
|
0d1aceda1b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
5 years ago |
|
jianjun
|
1549a7a1f5
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
5 years ago |
|
jianjun
|
bdc0ab6e20
|
修改工作实况日期bug
|
5 years ago |
|
jianjun
|
d657ee22cc
|
再次修改
|
5 years ago |
zhaoqifeng
|
9491ab4989
|
Merge branch 'dev_bugfix_ljj' into dev
|
5 years ago |
|
zhaoqifeng
|
f7473e902b
|
Merge branch 'develop' into release_temp
|
5 years ago |
|
zhaoqifeng
|
7af5e7fe0e
|
Merge branch 'dev_bugfix_ljj' into develop
|
5 years ago |
|
zhaoqifeng
|
8df605b3cd
|
党员认证bug
|
5 years ago |
wxz
|
17ee703d6b
|
Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
5 years ago |
|
wxz
|
2557b58325
|
补充提交：漏了openapi-sdk依赖
|
5 years ago |
|
wxz
|
8f9c4394e0
|
版本升级
|
5 years ago |
|
wxz
|
13e05d3310
|
Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
5 years ago |
|
wxz
|
e71b2c5f78
|
Merge branches 'dev' and 'wxz_pingyin_push_weixin' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_pingyin_push_weixin
|
5 years ago |
|
wxz
|
b5d66cebfd
|
1.提取openapi-sdk
2.调整third apiService相关逻辑
3.完成推送component access token到私有化平台接口
|
5 years ago |
|
sunyuchao
|
1a33b66a1e
|
Merge branch 'develop' into release_temp
|
5 years ago |
|
sunyuchao
|
05abafee1e
|
Merge branch 'dev_staff_info' into develop
|
5 years ago |
|
sunyuchao
|
a4b5a6b3b9
|
组织/部门/网格名称不能超过20字
|
5 years ago |
zxc
|
70a8406ac3
|
再改
|
5 years ago |
|
zxc
|
c9bc94efd5
|
统计服务升级
|
5 years ago |
|
zxc
|
1cb8b54b0d
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
zxc
|
3314c0355f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
5 years ago |
|
zxc
|
cdf0cd7ff3
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
5 years ago |
|
zxc
|
53400489e1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
5 years ago |
|
zxc
|
fa70a90619
|
在修改
|
5 years ago |
|
zxc
|
d9ef3477ee
|
啊
|
5 years ago |
|
zxc
|
27ebae1096
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
5 years ago |
|
zxc
|
b1e3614c5a
|
再次修改
|
5 years ago |
|
zxc
|
a3189c339c
|
统计升级
|
5 years ago |
|
zxc
|
43d292d88c
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
zxc
|
3cc9a0ce60
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
5 years ago |
|
zxc
|
0e02618094
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
5 years ago |
