wangxianzhang
|
5c88a6ad0a
|
Merge branch 'wxz_blockchain' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
9f6b32a3a8
|
修改：
修改BlockChainService中getResultOrThrowException()入参列表
|
4 years ago |
|
wangxianzhang
|
1772d47a30
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_blockchain
|
4 years ago |
|
wangxianzhang
|
d793c9d5b3
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
|
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 |
|
wangxianzhang
|
e5051a3b0c
|
Merge branch 'wxz_blockchain' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
e972128152
|
这一批都执行完再继续其他的 up
|
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 |
|
wangxianzhang
|
b0fad9854f
|
修改：
错误提交
|
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
|
368fe65a8d
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
dff03ab75b
|
修改信息。idNum修改
|
4 years ago |
|
jianjun
|
5fc76304a2
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
36e99dee20
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
6ddf42886c
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
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
|
8be5896e7a
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
45ef35eb0f
|
修改信息，除了本人外，校验身份证号是否已被使用。
|
4 years ago |
|
jianjun
|
d056b6bc81
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
ebfc6c328f
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
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 |
|
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 |
|
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 |
