jianjun
|
25beb60eec
|
Merge remote-tracking branch 'remotes/origin/dev_tduck_mix' into develop
# Conflicts:
# epmet-gateway/src/main/resources/bootstrap.yml
|
4 years ago |
zhaoqifeng
|
e5a9b5c55d
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
zhaoqifeng
|
4ecde84040
|
居民端首页积分排行修改
|
4 years ago |
yinzuomei
|
6c842f8925
|
Merge remote-tracking branch 'origin/dev_group_msg' into develop
|
4 years ago |
|
yinzuomei
|
1ae7adf0db
|
居民端提交徽章认证申请，记录messageType，targetId bugfix
|
4 years ago |
sunyuchao
|
0b47b0a8d7
|
Merge branch 'dev_export_excel' into develop
|
4 years ago |
|
sunyuchao
|
84ce7bf087
|
程序优化
|
4 years ago |
|
yinzuomei
|
6508992027
|
Merge remote-tracking branch 'origin/dev_group_msg' into develop
|
4 years ago |
|
yinzuomei
|
4601e5fbc0
|
居民端提交徽章认证申请，记录messageType，targetId
|
4 years ago |
|
zhaoqifeng
|
30936465d6
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
zhaoqifeng
|
adbd27778a
|
Merge branch 'dev_guidance' into develop
# Conflicts:
# epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
|
4 years ago |
|
sunyuchao
|
3f0476122e
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
sunyuchao
|
4d6aed3144
|
Merge branch 'dev_export_excel' into develop
|
4 years ago |
|
sunyuchao
|
be58a18db8
|
问题不大
|
4 years ago |
|
zhaoqifeng
|
0b0f9b307d
|
居民端首页积分排行
|
4 years ago |
zxc
|
2125503a97
|
Merge remote-tracking branch 'origin/dev_export_excel' into develop
|
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 |
|
zxc
|
9ab4c5c290
|
Merge branch 'dev_export_excel' into develop
|
4 years ago |
|
sunyuchao
|
6086bf80f4
|
Merge remote-tracking branch 'origin/dev_export_excel' into dev_export_excel
|
4 years ago |
|
sunyuchao
|
797ce8fbd2
|
优化 暂不支持分页
|
4 years ago |
|
zxc
|
f98fd8fa17
|
Merge branch 'dev_export_excel' into develop
|
4 years ago |
|
zxc
|
d678089b80
|
emm
|
4 years ago |
|
zxc
|
6b30cb63bc
|
Merge remote-tracking branch 'origin/dev_export_excel' into develop
|
4 years ago |
|
sunyuchao
|
e62e3fd471
|
运营数据查询初版
|
4 years ago |
|
jianjun
|
acbfda5c40
|
gateway添加tduck服务
|
4 years ago |
|
zxc
|
94c6a912f1
|
Merge remote-tracking branch 'origin/dev_export_excel' into develop
|
4 years ago |
|
sunyuchao
|
d6c2c987ea
|
Merge remote-tracking branch 'origin/dev_export_excel' into dev_export_excel
|
4 years ago |
|
sunyuchao
|
55ef5c34c1
|
方法模板
|
4 years ago |
|
zxc
|
35a41b3b0a
|
Merge remote-tracking branch 'origin/dev_export_excel' into develop
|
4 years ago |
|
zxc
|
6878418ec7
|
emm
|
4 years ago |
|
sunyuchao
|
b12403e092
|
Merge remote-tracking branch 'origin/dev_export_excel' into dev_export_excel
|
4 years ago |
|
sunyuchao
|
88b5e10ca7
|
方法模板
|
4 years ago |
|
zxc
|
3933bddf42
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
|
zxc
|
52318da489
|
修改入参，原来固定从token取，改为前端传，没传从token取
|
4 years ago |
|
wxz
|
fa3dd8db67
|
Merge branch 'wxz_send_message' into develop
|
4 years ago |
|
wxz
|
f8e2210f24
|
新增：
1.【发送消息】新增组成员
2.【发送消息】移除组成员
3.【发送消息】修改组信息
4.【发送消息】删除组
|
4 years ago |
|
zxc
|
4d5c1b6043
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
|
zxc
|
a0b75c9ad4
|
.......
|
4 years ago |
|
zxc
|
517185a897
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
|
zxc
|
773a2d136b
|
日期
|
4 years ago |
|
zxc
|
fbba7d7084
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
zxc
|
71179f6cb7
|
日期格式修改
|
4 years ago |
|
zxc
|
c03c83ea7a
|
新方法添加
|
4 years ago |
|
sunyuchao
|
b314b9d19d
|
方法模板
|
4 years ago |
|
yinzuomei
|
94eb295544
|
Merge remote-tracking branch 'origin/dev_group_msg' into develop
|
4 years ago |
|
yinzuomei
|
061eaaa4cc
|
消息列表修改，gov-mine、message
|
4 years ago |
|
zxc
|
f91d3d5dc4
|
巡查时长秒
|
4 years ago |
|
wxz
|
ee58d18d7a
|
Merge branch 'dev_group_msg' into develop
|
4 years ago |
