yinzuomei
|
aa54bf2c73
|
组织生活发布：resi-group
|
4 years ago |
|
yinzuomei
|
e1dd0abcf0
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
30c306ba71
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev
|
4 years ago |
sunyuchao
|
a61fd17deb
|
组织下不允许看到非组织添加的人员、部门网格下添加的人不允许再部门网格下移除
|
4 years ago |
|
yinzuomei
|
cf66c63e62
|
txl+fsxx：agg、message、user、gov-access、issue、gov-mine、gov-org、resi-party
|
4 years ago |
|
yinzuomei
|
8e651995a8
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
f21f8f2a5e
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev
|
4 years ago |
|
yinzuomei
|
624f39998a
|
month/indexscore接口修改 发布
|
4 years ago |
|
yinzuomei
|
d4e80efb59
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
084be558ed
|
month/indexscore接口修改
|
4 years ago |
|
yinzuomei
|
c20d0e5029
|
/report/fact/index/scorelist接口修改 发布
|
4 years ago |
|
yinzuomei
|
cce2c775b2
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
3dfb39724f
|
/report/fact/index/scorelist接口修改
|
4 years ago |
|
yinzuomei
|
742d452bd6
|
selectMonthPieChart修改 fb
|
4 years ago |
|
yinzuomei
|
4909765bde
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
24c02ab557
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
7d2ccc1906
|
selectMonthPieChart修改
|
4 years ago |
wxz
|
16541a6cf8
|
版本升级
|
4 years ago |
zxc
|
e7e23d0073
|
统计服务升级
|
4 years ago |
|
zxc
|
bbe7e752e8
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
8d08abc80c
|
screenProjectOrgDaily修改
|
4 years ago |
|
sunyuchao
|
23936ab743
|
组织内有单位领导标签的人排在前面，网格内有网格长标签的人排在前面，部门内有部门领导标签的人排在前面，相同职位及其他职位按创建顺序排序
|
4 years ago |
jianjun
|
182dd06c66
|
差值 差值 代码微调
|
4 years ago |
|
jianjun
|
b538a3c5d1
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
a574ef5683
|
差值 差值 代码微调
|
4 years ago |
|
jianjun
|
7e1a228191
|
差值 差值
|
4 years ago |
|
sunyuchao
|
b1c45ef558
|
sql优化
|
4 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
|
4 years ago |
|
jianjun
|
b06a621c1a
|
。。。
|
4 years ago |
|
jianjun
|
e513dd925e
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
59f134ef54
|
。。。
|
4 years ago |
|
jianjun
|
882874e5ad
|
。。。
|
4 years ago |
|
jianjun
|
0528034032
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
65d8cbcd19
|
倒序
|
4 years ago |
|
jianjun
|
9a71700c6c
|
再次修改 上线agg
|
4 years ago |
|
jianjun
|
abd72fab36
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
da97cb9149
|
修改工作实况日期bug agg 上线
|
4 years ago |
|
jianjun
|
0d1aceda1b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
1549a7a1f5
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
bdc0ab6e20
|
修改工作实况日期bug
|
4 years ago |
|
jianjun
|
d657ee22cc
|
再次修改
|
4 years ago |
zhaoqifeng
|
9491ab4989
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
8df605b3cd
|
党员认证bug
|
4 years ago |
|
wxz
|
17ee703d6b
|
Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wxz
|
2557b58325
|
补充提交：漏了openapi-sdk依赖
|
4 years ago |
|
wxz
|
8f9c4394e0
|
版本升级
|
4 years ago |
|
wxz
|
13e05d3310
|
Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 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
|
4 years ago |
|
wxz
|
b5d66cebfd
|
1.提取openapi-sdk
2.调整third apiService相关逻辑
3.完成推送component access token到私有化平台接口
|
4 years ago |
|
sunyuchao
|
a4b5a6b3b9
|
组织/部门/网格名称不能超过20字
|
4 years ago |
