sunyuchao
|
702f346adc
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
894dc584b3
|
解决sql脚本冲突问题
|
5 years ago |
|
sunyuchao
|
97bdca2f1d
|
解决sql脚本冲突问题
|
5 years ago |
|
sunyuchao
|
596b6ca214
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
cda2332c13
|
Merge branch 'dev_issue_category' into dev
|
5 years ago |
|
sunyuchao
|
87e0cb75df
|
解决sql脚本冲突问题
|
5 years ago |
|
sunyuchao
|
aff538dec8
|
议题项目分类标签发布生产
|
5 years ago |
|
sunyuchao
|
85b3bf3154
|
Merge branch 'dev'
|
5 years ago |
jianjun
|
e95d3a210d
|
Merge remote-tracking branch 'remotes/origin/dev_issue_category' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
5 years ago |
|
jianjun
|
2a3f67e870
|
升级服务 小组审核二维码失败+其他优化
|
5 years ago |
|
sunyuchao
|
9e1319f2a2
|
外挂接口-居民端基本信息-添加返参
|
5 years ago |
|
sunyuchao
|
5cb70094ae
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
ef9706556e
|
Merge branch 'dev_ext_syc' into dev
|
5 years ago |
|
sunyuchao
|
638461aea7
|
返参调整
|
5 years ago |
|
sunyuchao
|
158a407d5f
|
Merge branch 'dev_ext_syc' into dev
|
5 years ago |
|
jianjun
|
3e83dcc772
|
Merge remote-tracking branch 'remotes/origin/dev_group_qrcode' into dev
|
5 years ago |
|
jianjun
|
abc2212149
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
5212a78c85
|
Merge remote-tracking branch 'remotes/origin/dev_wx_msg' into dev
|
5 years ago |
|
jianjun
|
81d2b8cafa
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
5 years ago |
yinzuomei
|
7e45d86713
|
xc分支计算修改，发布
|
5 years ago |
|
jianjun
|
2e526db366
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
4b9ff3177d
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
yinzuomei
|
c454ee9433
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
jianjun
|
1f88b8b961
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_user_cache' into dev
|
5 years ago |
|
yinzuomei
|
7e8e1e10d9
|
Merge remote-tracking branch 'origin/dev_20210401_bug' into dev
|
5 years ago |
|
sunyuchao
|
af654ba49c
|
外挂接口新增返参
|
5 years ago |
zhaoqifeng
|
f6edba2b83
|
小组审核生成二维码报错
|
5 years ago |
|
jianjun
|
ae7244d568
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
d907cfbc28
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
|
5 years ago |
zhangyongzhangyong
|
66886e45aa
|
oper-customer 版本号升级
|
5 years ago |
|
zhangyongzhangyong
|
60c36c6ad8
|
Merge branch 'dev'
|
5 years ago |
|
jianjun
|
1760665358
|
处理用户基础信息 报错,设置默认空字符串
|
5 years ago |
|
jianjun
|
863f625f27
|
处理用户基础信息 报错
|
5 years ago |
|
jianjun
|
b2e6a45541
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_optimize_ljj
|
5 years ago |
|
yinzuomei
|
82a23663c1
|
添加注释
|
5 years ago |
zxc
|
d305c08aa5
|
平阴数据bug修复
|
5 years ago |
|
zhangyongzhangyong
|
b310170a70
|
定制功能列表 添加分页
|
5 years ago |
|
jianjun
|
b1bd75a61c
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
80e87810ad
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev
|
5 years ago |
|
jianjun
|
d798d0fcd3
|
去掉调试日志
|
5 years ago |
|
jianjun
|
714fd06539
|
党建声音pdf功能上线
|
5 years ago |
|
jianjun
|
b024c7aa3b
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
3abed293ef
|
Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev
# Conflicts:
# epmet-gateway/src/main/resources/bootstrap.yml
|
5 years ago |
|
jianjun
|
7f22d27e2b
|
升级aliyun-sdk-oss
|
5 years ago |
wangchao
|
8b601d4258
|
data-stats 服务升级 125 -> 126
|
5 years ago |
|
wangchao
|
cc08745fe3
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
wangchao
|
78fa18f510
|
Merge branch 'dev_bugfix_0329_whistled_project_count' into dev
|
5 years ago |
|
wangchao
|
7d0333004a
|
修改评价周期内被吹哨项目数与评价周期内被办结项目数的算法
|
5 years ago |
|
jianjun
|
568c600c90
|
重复提交使用@Before注解->还需要优化 本地缓存解决不了 分布式
|
5 years ago |
|
jianjun
|
ff8bea4200
|
删除无用代码
|
5 years ago |
