jianjun
|
bcc1ec34b7
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
33d5eaf758
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
|
4 years ago |
zhaoqifeng
|
5aa5e48473
|
治理能力统计修改
|
4 years ago |
|
jianjun
|
e8bb2fce86
|
这一批都执行完再继续其他的 up
|
4 years ago |
|
jianjun
|
174dfa5989
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
e972128152
|
这一批都执行完再继续其他的 up
|
4 years ago |
|
jianjun
|
2bb768d6dd
|
这一批都执行完再继续其他的 up
|
4 years ago |
|
jianjun
|
6b413274da
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
1c2a843874
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
a641e679e1
|
这一批都执行完再继续其他的
|
4 years ago |
|
jianjun
|
d8078aa717
|
话题 网格为空时 继续下次 up
|
4 years ago |
|
zhaoqifeng
|
d0c28354f5
|
党员抽取修改
|
4 years ago |
|
jianjun
|
70f5e1e385
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
1fcbf67031
|
话题 网格为空时 继续下次
|
4 years ago |
|
zhaoqifeng
|
ab2440d23f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
cff289eca5
|
话题 网格为空时 继续下次
|
4 years ago |
|
zhaoqifeng
|
a42931f6d7
|
项目抽取修改
|
4 years ago |
|
jianjun
|
a236cbf7a2
|
暂时先加上吧
|
4 years ago |
yinzuomei
|
dff03ab75b
|
修改信息。idNum修改
|
4 years ago |
|
jianjun
|
34cca4d59d
|
bug 改不尽
|
4 years ago |
|
yinzuomei
|
af52c088e7
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
yinzuomei
|
a6fc616d1f
|
completeIdNum
|
4 years ago |
sunyuchao
|
7dd700a827
|
项目处理分析方法模板
|
4 years ago |
|
yinzuomei
|
45ef35eb0f
|
修改信息，除了本人外，校验身份证号是否已被使用。
|
4 years ago |
|
jianjun
|
79db617df5
|
处理排序
|
4 years ago |
|
yinzuomei
|
87dcd76415
|
sqlbugfix
|
4 years ago |
|
jianjun
|
7163c1b0e0
|
用map 获取用户里的信息
|
4 years ago |
|
yinzuomei
|
02c7efe329
|
根据身份证号||ic_resi_user.id找居民端小程序里的人
|
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 |
|
sunyuchao
|
a364a1fbb7
|
工作人员缓存信息添加所属组织经纬度信息，没有则去客户根组织经纬度的值
|
4 years ago |
|
sunyuchao
|
f2a05962fe
|
程序优化
|
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 |
