sunyuchao
|
fbde100271
|
新增接口根据staffId查询基本信息
|
5 years ago |
zxc
|
81eb862df3
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
39bc9f6f4c
|
党支部新接口添加
|
5 years ago |
wangchao
|
d4eebd418c
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
wangchao
|
02915fc883
|
党员认证提交记录校验去除网格Id，如果居民在一个网格下申请了党员，在其余网格不能再次申请党员。
|
5 years ago |
|
zxc
|
de6d5dbd63
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
0bc88795f4
|
党支部新接口添加
|
5 years ago |
jianjun
|
b2fd9f5121
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
jianjun
|
60d714052c
|
获取下级组织调整
|
5 years ago |
|
wangchao
|
1fb8c15db8
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wangchao
|
5920b69919
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_difficulty_data
|
5 years ago |
zhaoqifeng
|
84a9a392a6
|
项目超期滞留提醒修改
|
5 years ago |
|
wangchao
|
47722c9008
|
难点赌点抽取修改
|
5 years ago |
|
sunyuchao
|
20876816ed
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
f36175413d
|
工作端查询我的基本信息接口添加手机号返参用于微信消息订阅
|
5 years ago |
|
sunyuchao
|
de03d524f0
|
Merge branch 'dev_wx_msg' into dev_temp
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
5 years ago |
liushaowen
|
9107d97bcf
|
模板key修改
|
5 years ago |
|
liushaowen
|
156a257c99
|
消息订阅添加gridId，添加跳转page设置
|
5 years ago |
|
sunyuchao
|
7eed693973
|
订阅消息发送添加gridId入参
|
5 years ago |
|
zxc
|
78189deaf7
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
bd480623df
|
党支部新接口添加
|
5 years ago |
|
jianjun
|
362d1875b2
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
jianjun
|
a58441c787
|
调整 sql 判断
|
5 years ago |
|
jianjun
|
b4f203905b
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
jianjun
|
53dcbc1aa9
|
查询组织下所有的难点堵点数据，不需要orgType
|
5 years ago |
|
sunyuchao
|
765f1c7046
|
消息发送记录表添加网格ID
|
5 years ago |
|
jianjun
|
1debefc6ae
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
jianjun
|
f7085b3e67
|
查询组织下所有的难点堵点数据
|
5 years ago |
|
zxc
|
98934d9e70
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
92e24b68cc
|
党支部新接口添加
|
5 years ago |
|
liushaowen
|
4421c0ba75
|
添加gridId字段
|
5 years ago |
|
jianjun
|
6d1299fb6e
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
f0e4240e6b
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
|
5 years ago |
|
jianjun
|
3291170ed6
|
调整判断
|
5 years ago |
|
sunyuchao
|
b887184649
|
查询客户小程序模板列表
|
5 years ago |
|
sunyuchao
|
2440ebc200
|
Merge branches 'dev' and 'dev_wx_msg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_wx_msg
Conflicts:
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
|
5 years ago |
wxz
|
a3ca90a60c
|
Merge branch 'dev_newversion' into dev_temp
# Conflicts:
# epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
|
5 years ago |
|
wxz
|
8d00b1362f
|
修改compose-test.yml的版本，使用时间戳版本
|
5 years ago |
|
sunyuchao
|
bfe8058437
|
按客户查询模板Id列表
|
5 years ago |
|
wangchao
|
cea1aa99a1
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wangchao
|
c2cec55b80
|
project flyway脚本修改
|
5 years ago |
|
wangchao
|
6972e725b4
|
project flyway脚本修改
|
5 years ago |
|
wangchao
|
fb8d664482
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wangchao
|
76c8e5bb82
|
项目节点耗时数据补充 增加第一次响应时效
|
5 years ago |
|
sunyuchao
|
e3524400a1
|
Merge branches 'dev' and 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
wangchao
|
390761ab0f
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wangchao
|
e8256162e3
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_difficulty_data
|
5 years ago |
|
wangchao
|
92e6ee41d4
|
项目节点耗时数据补齐接口
|
5 years ago |
|
zxc
|
ca1128f375
|
备注修改
|
5 years ago |
|
jianjun
|
e1e9ec5f1e
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
