jianjun
|
5b99842c55
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
9ab2c03fc7
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
50babd183b
|
先进排行查询-添加areaCode
|
4 years ago |
yinzuomei
|
a7379075f9
|
丢了#
|
4 years ago |
|
yinzuomei
|
495c767ded
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
c44b7cbb0a
|
工作端下级组织指数排行与平阴大屏下级单位指数排行保持一致，取月表
|
4 years ago |
sunyuchao
|
e8dc33ccdf
|
更多-巡查记录-程序优化
|
4 years ago |
zhaoqifeng
|
61266c83a2
|
党员认证某种情况下提交两次bug修改
|
4 years ago |
|
jianjun
|
fc7951ebfa
|
Merge branch 'dev_py_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
4b244048c9
|
集成平台接口对外暴露
|
4 years ago |
|
jianjun
|
1c73258d8d
|
Merge remote-tracking branch 'remotes/origin/dev_py_platform' into develop
|
4 years ago |
|
jianjun
|
cf68bd8b88
|
集成平台接口对外暴露
|
4 years ago |
zxc
|
518be07ba4
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
zxc
|
3b33bf2fb9
|
展示name
|
4 years ago |
|
zxc
|
4ffd57f310
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
zxc
|
0fc473f565
|
img
|
4 years ago |
|
zxc
|
7c761cc0b7
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
zxc
|
62bfffeb9c
|
改正
|
4 years ago |
|
jianjun
|
745a3e4eac
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
53cd458bdb
|
Merge branch 'dev_py_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
837c5b9ead
|
resource 下excel避免打包加密
|
4 years ago |
|
yinzuomei
|
46ee81313e
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
yinzuomei
|
9251f853f1
|
Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
|
4 years ago |
|
yinzuomei
|
b5505c4ecd
|
报事，修改@人大代表可为空，报事人回复时，回复表存储的是XXX街道-姓女士/先生
|
4 years ago |
|
zxc
|
6b77aff2d6
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
zxc
|
5e2cc37fe9
|
bug
|
4 years ago |
|
zxc
|
1b6ad1fdf1
|
Merge remote-tracking branch 'origin/dev_badge_0809' into develop
|
4 years ago |
|
zxc
|
20b7fdc864
|
执行的sql
|
4 years ago |
|
zxc
|
ce8a5cf17d
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
zxc
|
add11558de
|
bug
|
4 years ago |
|
jianjun
|
df50778445
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_py_platform
|
4 years ago |
|
jianjun
|
867122b510
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
76fed5169a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
d2b25b83fe
|
创建话题审核失败 日志比较调整为warn
|
4 years ago |
|
yinzuomei
|
20c8b12df9
|
Merge remote-tracking branch 'origin/dev_resi_event' into develop
|
4 years ago |
|
yinzuomei
|
dbdb0ae988
|
Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
|
4 years ago |
|
yinzuomei
|
346adcef6b
|
报事转项目，内部备注，不必填
|
4 years ago |
|
zxc
|
accd24f1d2
|
Merge remote-tracking branch 'origin/dev_badge_0809' into develop
|
4 years ago |
|
zxc
|
41e9130165
|
badgeKey添加默认值
|
4 years ago |
|
zxc
|
146a707b66
|
Merge remote-tracking branch 'origin/dev_badge_0809' into develop
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java
|
4 years ago |
|
zxc
|
908015530d
|
徽章名称修改，
|
4 years ago |
wxz
|
90b84b8ba3
|
Merge branch 'dev_resi_event' into develop
|
4 years ago |
|
wxz
|
c3c60d039e
|
修改：报事-查询人大代表，自己如果是人大代表则不列出来
|
4 years ago |
|
jianjun
|
c672747f2c
|
Merge remote-tracking branch 'remotes/origin/dev_py_platform' into develop
|
4 years ago |
|
jianjun
|
92f8cdc441
|
导出文件名
|
4 years ago |
|
jianjun
|
9abaee36b9
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
a2f6641e21
|
Merge branch 'dev_py_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
8136ab26b8
|
集成平台数据导出
|
4 years ago |
|
zxc
|
9043302fd3
|
Merge remote-tracking branch 'origin/dev_statistical_optimize' into develop
|
4 years ago |
|
zxc
|
5d32373581
|
groupAgencyDaily删除、添加时增加分页操作
|
4 years ago |
