yinzuomei
|
61c2ed6ad7
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
|
4 years ago |
|
yinzuomei
|
06467acabf
|
活动类别字典
|
4 years ago |
jianjun
|
60e5e3d8e2
|
Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
|
4 years ago |
|
jianjun
|
5a2758b3a2
|
优化footBar方法
|
4 years ago |
sunyuchao
|
c723ecd776
|
编译
|
4 years ago |
|
sunyuchao
|
fa76242e0b
|
小组通知保存
|
4 years ago |
|
jianjun
|
b288edbbb8
|
Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
|
4 years ago |
|
jianjun
|
705efe9d43
|
去掉多线程
|
4 years ago |
zhaoqifeng
|
2c49647fee
|
小组成就相关表代码生成
|
4 years ago |
|
jianjun
|
233cc511c8
|
Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
|
4 years ago |
|
jianjun
|
57dab627cc
|
开个线程试试
|
4 years ago |
|
jianjun
|
a12c34afbe
|
Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
|
4 years ago |
|
jianjun
|
ae6f195fab
|
接口代码结构微调 性能暂无变化
|
4 years ago |
|
jianjun
|
26e259c5af
|
Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
|
4 years ago |
|
jianjun
|
2d64a43b82
|
获取网格基础信息接口
|
4 years ago |
|
jianjun
|
bf9bd49d2c
|
Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
|
4 years ago |
|
jianjun
|
1ca7460013
|
获取网格基础信息接口
|
4 years ago |
|
jianjun
|
60d90ea9ce
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
4 years ago |
|
jianjun
|
fff8c88984
|
Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
|
4 years ago |
|
jianjun
|
7a623cf1e0
|
获取网格基础信息接口
|
4 years ago |
|
yinzuomei
|
93ce9becdd
|
列名修改
|
4 years ago |
|
yinzuomei
|
b3e6c154f7
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
4 years ago |
|
yinzuomei
|
726db623dc
|
列名修改
|
4 years ago |
|
sunyuchao
|
3b2efc5990
|
小组通知代码生成
|
4 years ago |
|
jianjun
|
8c394f2d4d
|
改为okhttp试试 看看是否还超时
|
4 years ago |
|
yinzuomei
|
78dc00de47
|
代码初始提交
|
4 years ago |
|
sunyuchao
|
1c1342e555
|
Merge branch 'dev_project_approval' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
|
4 years ago |
|
sunyuchao
|
1c49996f52
|
项目立项添加操作权限
|
4 years ago |
|
sunyuchao
|
ebfa49c6cc
|
项目立项标题20字
|
4 years ago |
|
jianjun
|
ead9dbf83d
|
调整调用第三方日志
|
4 years ago |
|
yinzuomei
|
2df8a2d460
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
4 years ago |
|
yinzuomei
|
54106eccd3
|
agencyDetail
|
4 years ago |
|
yinzuomei
|
bf753487ff
|
agencyDetail
|
4 years ago |
|
yinzuomei
|
e11dd84e56
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
4 years ago |
|
yinzuomei
|
3d7e1af75c
|
修改组织信息
|
4 years ago |
|
yinzuomei
|
d8dc65eff9
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
4 years ago |
|
yinzuomei
|
8d647eab78
|
修改组织信息
|
4 years ago |
zxc
|
d6b180806f
|
事件分析 org-月 统计
|
4 years ago |
|
yinzuomei
|
efcf6d4d2a
|
agencydetail接口膝盖，areaName返回空字符串not null
|
4 years ago |
|
yinzuomei
|
5e410685a9
|
请选择组织区划重复提示
|
4 years ago |
|
zxc
|
ddafed7302
|
项目分析 统计直接立项查询 gridId修改 = ''
|
4 years ago |
|
zxc
|
5f1930356c
|
项目分类统计直接立项查询 gridId修改 = ''
|
4 years ago |
|
zxc
|
07274e5dc0
|
事件分析单/多客户暂时分开，【org-月】
|
4 years ago |
|
zxc
|
4b61d8920a
|
事件分析单/多客户暂时分开，【org-天】
|
4 years ago |
|
yinzuomei
|
347687e0ae
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
4 years ago |
|
yinzuomei
|
ff7a5bed55
|
departmentdetail
|
4 years ago |
|
yinzuomei
|
7651da3361
|
Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
|
4 years ago |
|
yinzuomei
|
017bf883dc
|
新增组织V2接口提交
|
4 years ago |
|
jianjun
|
77a21116a4
|
难点堵点图片 设置customerId
|
4 years ago |
|
jianjun
|
3b7bc9a8d8
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_project_approval
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
|
4 years ago |
