jianjun
|
79db617df5
|
处理排序
|
4 years ago |
yinzuomei
|
5ef98a320d
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
87dcd76415
|
sqlbugfix
|
4 years ago |
|
jianjun
|
46c7eba41e
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
103b8916ce
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
# Conflicts:
# epmet-admin/epmet-admin-server/pom.xml
# epmet-auth/pom.xml
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
# epmet-module/epmet-point/epmet-point-server/pom.xml
# epmet-module/oper-access/oper-access-server/pom.xml
# epmet-module/oper-customize/oper-customize-server/pom.xml
# epmet-module/resi-home/resi-home-server/pom.xml
# epmet-module/resi-voice/resi-voice-server/pom.xml
# epmet-openapi/epmet-openapi-scan/pom.xml
|
4 years ago |
|
yinzuomei
|
8710be2f4a
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
jianjun
|
7163c1b0e0
|
用map 获取用户里的信息
|
4 years ago |
|
yinzuomei
|
02c7efe329
|
根据身份证号||ic_resi_user.id找居民端小程序里的人
|
4 years ago |
zxc
|
b21206b799
|
feign
|
4 years ago |
|
jianjun
|
3c816167cb
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
4 years ago |
|
zxc
|
49b59c3f67
|
一级分类查询
|
4 years ago |
sunyuchao
|
a364a1fbb7
|
工作人员缓存信息添加所属组织经纬度信息，没有则去客户根组织经纬度的值
|
4 years ago |
|
yinzuomei
|
be18795679
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
ba23bc3f5b
|
/personalcenter/initinfo返参增加idNum
|
4 years ago |
|
yinzuomei
|
1655746b31
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
893ef66c0a
|
profile增加completeIdNum
|
4 years ago |
|
yinzuomei
|
31a0cdcbef
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
c9277843b2
|
/point/resi/point/pageuserpoint
|
4 years ago |
|
yinzuomei
|
8ae7744fdf
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
c4a7b79ff0
|
Merge branches 'dev_ic_data' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_data
|
4 years ago |
wangxianzhang
|
54adaf8d20
|
修改：
错误提交
|
4 years ago |
|
wangxianzhang
|
993c3d9eb5
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_blockchain
|
4 years ago |
|
wangxianzhang
|
8cba8e02f4
|
修改：
调整上链数据，丰富中文展示字段
|
4 years ago |
|
sunyuchao
|
f2a05962fe
|
程序优化
|
4 years ago |
|
zxc
|
56b39d0839
|
时间段获取利器
|
4 years ago |
|
yinzuomei
|
f74c0ace18
|
修改""mydemand""接口入参新增epmetUserId
|
4 years ago |
|
yinzuomei
|
42c88be184
|
修改"persondata"接口返参新增epmetUserId，icResiUserId
|
4 years ago |
|
yinzuomei
|
745d249f47
|
"finduser"3者不能同时为空
|
4 years ago |
|
yinzuomei
|
e542453c10
|
"mydemand"接口查询的是PC录入的需求+居民端小程序用户自己上报的需求
|
4 years ago |
|
yinzuomei
|
7130b6cfbd
|
"mydemand"接口查询的是PC录入的需求+居民端小程序用户自己上报的需求
|
4 years ago |
|
yinzuomei
|
95a564b77b
|
根据身份证号找人：/epmetuser/user/finduser
|
4 years ago |
|
yinzuomei
|
d34a34ef12
|
根据身份证号找人：/epmetuser/user/finduser
|
4 years ago |
|
yinzuomei
|
b62ef09e02
|
完善党员信息自动注册居民增加身份证号
|
4 years ago |
|
yinzuomei
|
f30e111751
|
api/resi/mine/mine/profile返参增加completeIdNum：true:已完善身份证号；false：未完善身份证号。
只有registerFlag=true&&completeIdNum=false时才提醒用户完善信息
|
4 years ago |
|
yinzuomei
|
72dad217f1
|
/personalcenter/editinfo增加入参idNum
|
4 years ago |
zhaoqifeng
|
20122b4936
|
治理能力统计修改
|
4 years ago |
|
yinzuomei
|
6967f3f275
|
/api/resi/mine/resiregister/submit，注册居民增加idNum.无法限制必填，因为不是所有小程序都发版。且同步到user_base_info
|
4 years ago |
|
zhaoqifeng
|
3684815b14
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
62cca3010b
|
如果项目只选择了一级分类 默认给第一个二级分类 up
|
4 years ago |
|
jianjun
|
3baffe6e8f
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
4b68d8418a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
7f0e50982d
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
70d621c3c4
|
Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
2ec966f7aa
|
如果项目只选择了一级分类 默认给第一个二级分类
|
4 years ago |
|
zhaoqifeng
|
0358f41bb6
|
治理能力统计修改
|
4 years ago |
|
yinzuomei
|
e143af2701
|
Merge branches 'dev' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_v2
|
4 years ago |
|
yinzuomei
|
aac87f7d0d
|
列表和详情需要返回一级分类编码和一级分类名称
|
4 years ago |
|
jianjun
|
2ed5d322ee
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
7efe46fa04
|
列表和详情需要返回一级分类编码和一级分类名称
|
4 years ago |
|
yinzuomei
|
42dc117de6
|
修改服务措施列表查询，需求详情
|
4 years ago |
