yinzuomei
|
24c02ab557
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
7d2ccc1906
|
selectMonthPieChart修改
|
4 years ago |
zxc
|
8d08abc80c
|
screenProjectOrgDaily修改
|
4 years ago |
sunyuchao
|
23936ab743
|
组织内有单位领导标签的人排在前面，网格内有网格长标签的人排在前面，部门内有部门领导标签的人排在前面，相同职位及其他职位按创建顺序排序
|
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
|
59f134ef54
|
。。。
|
4 years ago |
|
jianjun
|
65d8cbcd19
|
倒序
|
4 years ago |
|
jianjun
|
d657ee22cc
|
再次修改
|
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 |
zhaoqifeng
|
9491ab4989
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
8df605b3cd
|
党员认证bug
|
4 years ago |
wxz
|
2557b58325
|
补充提交：漏了openapi-sdk依赖
|
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 |
|
zxc
|
70a8406ac3
|
再改
|
4 years ago |
|
zxc
|
3314c0355f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
fa70a90619
|
在修改
|
4 years ago |
|
zxc
|
d9ef3477ee
|
啊
|
4 years ago |
|
zxc
|
b1e3614c5a
|
再次修改
|
4 years ago |
|
zxc
|
3cc9a0ce60
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
2feb5b5a2c
|
查询父客户存不存在的分类分组修改
|
4 years ago |
|
zxc
|
f5895d4364
|
事件分类网格天，添加删除
|
4 years ago |
|
zhaoqifeng
|
115f9ed6c6
|
工作人员调动
|
4 years ago |
|
sunyuchao
|
e0bffddd73
|
部门/网格下添加人员从组织选时 只能选择在组织添加的人
|
4 years ago |
|
sunyuchao
|
a708165f1a
|
查询当前人员所属组织、组织下部门/网格树
|
4 years ago |
|
zhaoqifeng
|
2656296233
|
我的个人信息添加根组织信息
|
4 years ago |
|
sunyuchao
|
df489baf56
|
人员详情接口加返参
|
4 years ago |
|
zxc
|
435cae6a26
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
e163b5c962
|
EPMET_CATEGORY_CODE添加字符串条件
|
4 years ago |
|
zxc
|
a15db5b378
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
e863ee1502
|
log日志添加
|
4 years ago |
|
yinzuomei
|
6c5b8d3d24
|
查人bugfix
|
4 years ago |
|
sunyuchao
|
c47aae6ebf
|
Merge branch 'dev_yushan_screen' into dev
|
4 years ago |
|
sunyuchao
|
faead61a44
|
对外接口添加配置
|
4 years ago |
|
yinzuomei
|
206ad0454b
|
info相关表，列名统一大写
|
4 years ago |
|
jianjun
|
db5cf68a67
|
Merge remote-tracking branch 'remotes/origin/dev_yushan_screen' into dev
|
4 years ago |
|
zxc
|
00963e669b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
7564ef74fc
|
我收到的sql
|
4 years ago |
|
zxc
|
24c4edd1c9
|
分类统计添加另一种情况，修改删除顺序
|
4 years ago |
|
jianjun
|
3521a1aaec
|
提交
|
4 years ago |
|
sunyuchao
|
2e645b3cf9
|
无可奈何花落去
|
4 years ago |
|
yinzuomei
|
7b358dc461
|
创建组，不包含自己
|
4 years ago |
|
yinzuomei
|
03680e8415
|
创建组，不包含自己
|
4 years ago |
|
yinzuomei
|
c77d468a44
|
群组时间降序
|
4 years ago |
|
yinzuomei
|
3c29a9f825
|
多了个)
|
4 years ago |
