yinzuomei
|
1256b05a9a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
3f6337ac9e
|
bug#3356
|
4 years ago |
sunyuchao
|
89f2f37ead
|
Merge branch 'dev_export_excel' into dev
|
4 years ago |
|
sunyuchao
|
1d7fc9c6b4
|
数据导出与小程序数据保持一致
|
4 years ago |
|
sunyuchao
|
e749098c0c
|
Merge branch 'dev_export_excel' into dev
|
4 years ago |
|
sunyuchao
|
0c3fefd852
|
运营数据导出bug修改
|
4 years ago |
|
sunyuchao
|
24468a2bbe
|
Merge branch 'dev_export_excel' into dev
|
4 years ago |
|
sunyuchao
|
1b2f79835d
|
运营数据导出bug修改
|
4 years ago |
jianjun
|
494e286c99
|
Merge remote-tracking branch 'remotes/origin/dev_guidance' into dev
|
4 years ago |
zhaoqifeng
|
5a2343878c
|
获取指南模块接口修改
|
4 years ago |
|
yinzuomei
|
33bb788ef2
|
Merge remote-tracking branch 'origin/dev_group_msg' into dev
|
4 years ago |
|
yinzuomei
|
712daed9bd
|
查询缓存userfabu
|
4 years ago |
|
yinzuomei
|
bb9427d7fa
|
Merge remote-tracking branch 'origin/dev_group_msg' into dev
|
4 years ago |
|
yinzuomei
|
ba396b227f
|
活动评论bugfix
|
4 years ago |
|
jianjun
|
f3fafcfb85
|
Merge remote-tracking branch 'remotes/origin/dev_guidance' into dev
|
4 years ago |
|
zhaoqifeng
|
00e51c3851
|
组织树最后一级没有数据的话设null
|
4 years ago |
zxc
|
4ab0b2bb82
|
Merge remote-tracking branch 'origin/dev_act_bug' into dev
|
4 years ago |
|
zxc
|
55ad8f4019
|
组织生活
|
4 years ago |
|
jianjun
|
b4b672384d
|
Merge remote-tracking branch 'remotes/origin/dev_act_bug' into dev
|
4 years ago |
|
zxc
|
407aa7315b
|
point修改
|
4 years ago |
|
jianjun
|
1f2b644e4c
|
Merge remote-tracking branch 'remotes/origin/dev_group_msg' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Pinyin4jUtil.java
# epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
|
4 years ago |
|
jianjun
|
f97a9ee93a
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
0360206638
|
Merge remote-tracking branch 'remotes/origin/dev_guidance' into dev
|
4 years ago |
|
sunyuchao
|
ded490b830
|
Merge remote-tracking branch 'origin/dev_group_msg' into dev_group_msg
|
4 years ago |
|
sunyuchao
|
ca4efb1610
|
评论可以只传图片
|
4 years ago |
wxz
|
d1289da061
|
修改：【小组排名】我的小组，增加state过滤条件，只显示approved审核通过的
|
4 years ago |
|
zhaoqifeng
|
5307a5d09e
|
我的小组V2接口修改
|
4 years ago |
|
zhaoqifeng
|
f43e9813c1
|
指南模块默认字典表sql脚本
|
4 years ago |
|
wxz
|
f383586642
|
Merge remote-tracking branch 'origin/dev_group_msg' into dev_group_msg
|
4 years ago |
|
wxz
|
455382c55a
|
修改：【小组排名】网格下排名、客户下排名，名次断层问题修复
|
4 years ago |
|
jianjun
|
2dafaba625
|
调动多音字
|
4 years ago |
|
jianjun
|
8f73039413
|
去掉输出语句
|
4 years ago |
|
jianjun
|
3076bb45b0
|
pinyin工具类 除汉子外其他原样返回
|
4 years ago |
|
yinzuomei
|
3c356fd05b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
4527cf7516
|
小雷哥提出的需求：不显示工作人员那个小组
|
4 years ago |
|
sunyuchao
|
14bdf622ac
|
漏提sql脚本
|
4 years ago |
|
sunyuchao
|
96f24aa2bb
|
漏提sql脚本
|
4 years ago |
|
sunyuchao
|
19dabf04e1
|
Merge remote-tracking branch 'origin/dev_guidance' into dev
|
4 years ago |
|
sunyuchao
|
e3e35f81bd
|
Merge branch 'dev_export_excel' into dev
|
4 years ago |
|
zhaoqifeng
|
4885c77334
|
居民端首页积分排行修改
|
4 years ago |
|
sunyuchao
|
368b4ee98b
|
bug修改
|
4 years ago |
|
zhaoqifeng
|
4ecde84040
|
居民端首页积分排行修改
|
4 years ago |
|
yinzuomei
|
1ae7adf0db
|
居民端提交徽章认证申请，记录messageType，targetId bugfix
|
4 years ago |
|
sunyuchao
|
84ce7bf087
|
程序优化
|
4 years ago |
|
yinzuomei
|
4601e5fbc0
|
居民端提交徽章认证申请，记录messageType，targetId
|
4 years ago |
|
sunyuchao
|
be58a18db8
|
问题不大
|
4 years ago |
|
zhaoqifeng
|
0b0f9b307d
|
居民端首页积分排行
|
4 years ago |
|
zxc
|
b28b956d34
|
应前端要求格式调整
|
4 years ago |
|
sunyuchao
|
a27dbf979a
|
mlgb
|
4 years ago |
|
wxz
|
3485f34881
|
新增：
给scan添加平阴私有话服务器的外网ip，并且将所有已有的IP列表放到src/resources/readme下
|
4 years ago |
