yinzuomei
|
26b7cb51f4
|
工作日志查询接口bug修改
|
5 years ago |
|
yinzuomei
|
1b8869550f
|
工作日志查询接口测试
|
5 years ago |
|
yinzuomei
|
568b2cdf17
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
|
yinzuomei
|
8954b31f19
|
添加del_flag='0'
|
5 years ago |
liushaowen
|
b99b803b9d
|
项目信息上报，和查询 补
|
5 years ago |
jianjun
|
47b29d5bc4
|
第三方登陆返回错误信息
|
5 years ago |
|
yinzuomei
|
1feda0ae35
|
Merge branches 'dev' and 'dev_pyscreen' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreen
|
5 years ago |
|
yinzuomei
|
acc99bbc0b
|
Merge remote-tracking branch 'origin/dev_longwanscreen' into dev
|
5 years ago |
|
yinzuomei
|
0ee93cfde9
|
难点赌点接口bug
|
5 years ago |
|
yinzuomei
|
615280bfaa
|
Merge remote-tracking branch 'origin/dev_longwanscreen' into dev
|
5 years ago |
wangchao
|
87c9444625
|
难点赌点
|
5 years ago |
|
yinzuomei
|
9eb236cc49
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
|
yinzuomei
|
abef0b95d3
|
data-stat统计服务修改:指标计算获取子客户列表
|
5 years ago |
|
yinzuomei
|
ceda07db1c
|
datastat+1
|
5 years ago |
|
jianjun
|
930f6147d1
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen
|
5 years ago |
|
jianjun
|
a1b269b671
|
第三方登陆返回客户Id
|
5 years ago |
zxc
|
0e2b56c435
|
日志添加
|
5 years ago |
|
yinzuomei
|
8176c3542f
|
龙湾：项目详情；难点赌点主图两个接口修改
|
5 years ago |
|
liushaowen
|
1f072c3e84
|
项目信息上报，和查询
|
5 years ago |
sunyuchao
|
2156419088
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen
|
5 years ago |
|
sunyuchao
|
c54fcacde8
|
代码调整
|
5 years ago |
|
zxc
|
f47aca28de
|
树修改
|
5 years ago |
|
wangchao
|
39a40e6b1f
|
先锋模范查询修改
|
5 years ago |
|
jianjun
|
3f90ce6e85
|
抛出错误信息
|
5 years ago |
|
yinzuomei
|
ae0ef253a7
|
项目详情暂存1
|
5 years ago |
|
yinzuomei
|
69a74644bf
|
项目详情暂存
|
5 years ago |
|
jianjun
|
7b30c2c7ae
|
抛出错误信息
|
5 years ago |
|
sunyuchao
|
b1f02ebcd1
|
6、【工作日志】近12月趋势图
|
5 years ago |
|
zxc
|
23fdabfe0d
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen
|
5 years ago |
|
zxc
|
d7dfd41f5f
|
党员基本情况-年龄分布 修改
|
5 years ago |
zhaoqifeng
|
23184829cd
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen
|
5 years ago |
|
zhaoqifeng
|
293dbe25c5
|
【事件分析】类型分析
【事件/项目分析】按类别统计
|
5 years ago |
|
jianjun
|
e267762ee4
|
错误修改
|
5 years ago |
|
jianjun
|
18e0cff3ab
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_pyscreen
# Conflicts:
# epmet-auth/src/main/java/com/epmet/dto/form/SsoLoginFormDTO.java
# epmet-auth/src/main/java/com/epmet/service/SsoService.java
# epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java
|
5 years ago |
|
jianjun
|
951bb35228
|
平阴联动平台 登陆pc工作端接口
|
5 years ago |
|
zxc
|
2a7ed4a1aa
|
crm引入
|
5 years ago |
|
yinzuomei
|
0be9eb0fa4
|
新增项目分布接口供龙湾调用
|
5 years ago |
|
yinzuomei
|
9350f079b7
|
Merge remote-tracking branch 'origin/dev_areaCode' into dev_pyscreen
|
5 years ago |
|
yinzuomei
|
33485b07d9
|
Merge remote-tracking branch 'origin/dev_areaCode' into dev
|
5 years ago |
|
yinzuomei
|
c799f07949
|
工作日志采集接口添加orgName
|
5 years ago |
|
yinzuomei
|
7e695cdbde
|
修改api/commonservice/externalapp/get-jwt-accesstoken接口方便测试
|
5 years ago |
|
yinzuomei
|
b8c24cd20f
|
工作日志采集接口修改
|
5 years ago |
|
yinzuomei
|
3db7624cd6
|
Merge remote-tracking branch 'origin/dev_areaCode' into dev_pyscreen
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
|
5 years ago |
|
yinzuomei
|
da4e58bee7
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_areaCode
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
|
5 years ago |
|
yinzuomei
|
f82c704bdb
|
Merge remote-tracking branch 'origin/dev_areaCode' into dev
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java
|
5 years ago |
|
yinzuomei
|
a42ec8cb64
|
queryStaffPermissionV2修改
|
5 years ago |
|
yinzuomei
|
7911880c62
|
工作日志大屏API
|
5 years ago |
|
yinzuomei
|
da96b58174
|
工作日志采集API
|
5 years ago |
|
yinzuomei
|
8b203dd918
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
|
yinzuomei
|
932aa11b38
|
新增area_code修改
|
5 years ago |
