yinzuomei
|
a0f0f0df78
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
48959be5db
|
bugfix
|
4 years ago |
|
yinzuomei
|
7bbe543f5f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
4a783ac89d
|
bugfix
|
4 years ago |
|
yinzuomei
|
7afa4d8e54
|
热心市民积分排行，限制不是党员
|
4 years ago |
|
yinzuomei
|
744dde7119
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
1728f25dbe
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
f125ee7c73
|
热心市民积分排行，限制不是党员
|
4 years ago |
jianjun
|
b888f14de9
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
9b91558c9f
|
Merge remote-tracking branch 'remotes/origin/dev_badge_0809' into dev
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java
|
4 years ago |
|
jianjun
|
f0f3abc164
|
resi-event分支修改版本号
|
4 years ago |
|
jianjun
|
2ecedf2fb5
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
bc06e90511
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
d498bcccfb
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
a36905e814
|
巡查用户如果没查到返回null
|
4 years ago |
|
jianjun
|
a75c0da088
|
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts:
# epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml
# epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml
|
4 years ago |
|
jianjun
|
f048ebfd93
|
Merge remote-tracking branch 'remotes/origin/dev_resi_event' into dev
|
4 years ago |
wxz
|
5a78896bd8
|
外部应用查询接口，增加根据内外部客户类型进行筛选
|
4 years ago |
zxc
|
71d85910d7
|
图片顺序
|
4 years ago |
|
wxz
|
8c7a9315fd
|
删除无效的项目
|
4 years ago |
sunyuchao
|
a70db26b8c
|
优化
|
4 years ago |
|
sunyuchao
|
29f01f3161
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
36d8c53ffa
|
你好
|
4 years ago |
|
sunyuchao
|
785edd6b83
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
sunyuchao
|
b1a91f6bd2
|
你好
|
4 years ago |
|
jianjun
|
787bed27ab
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
1894d9da3c
|
查询用户和小组总数
|
4 years ago |
|
sunyuchao
|
0403fb40cc
|
转项目、立项选人接口去掉权限
|
4 years ago |
|
sunyuchao
|
0466477944
|
巡查列表程序优化
|
4 years ago |
|
yinzuomei
|
2ca25dab9e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
20820b5eb0
|
居民排行、大屏热心市民排序统一改为：先按照总积分降序，再按照姓名拼音升序。
|
4 years ago |
|
jianjun
|
e8082f2ae5
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
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 |
|
wxz
|
ec9074bfcb
|
Merge branch 'dev'
|
4 years ago |
|
wxz
|
30553c4cde
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wxz
|
5b05cf0110
|
优化网格员数据统计查询接口
|
4 years ago |
|
yinzuomei
|
d8c44adcbb
|
report升级
|
4 years ago |
|
yinzuomei
|
1133d52c09
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
02cd2632b2
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
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
|
9a40636842
|
升级
|
4 years ago |
|
sunyuchao
|
e8ce88787d
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
69492d3565
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
e8dc33ccdf
|
更多-巡查记录-程序优化
|
4 years ago |
|
wxz
|
effcd09c6a
|
版本升级
|
4 years ago |
|
wxz
|
ae0b8c95cb
|
Merge branch 'dev'
|
4 years ago |
|
wxz
|
d98405c31f
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
