zxc
|
a8aef62c40
|
引入
|
4 years ago |
|
zxc
|
c38c06ac1e
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
2bf1190645
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
bc45273f95
|
方法改回
|
4 years ago |
zhaoqifeng
|
fcb69256b8
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
caad6305f1
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
zhaoqifeng
|
63562c4404
|
组织单位列表展示积分
|
4 years ago |
|
zhaoqifeng
|
d0455827d7
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
33fe28d571
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
zhaoqifeng
|
24dad6271a
|
组织单位列表展示积分
|
4 years ago |
jianjun
|
1d2d5abb1f
|
user升级内存 512
|
4 years ago |
|
jianjun
|
bf4e40be39
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
jianjun
|
acebd6ce3e
|
去掉日志
|
4 years ago |
sunyuchao
|
6362e43078
|
市北赋能平台查询议题创建人姓名，因没有上传userWechat表 所以改去userbaseinfo表查询
|
4 years ago |
|
zxc
|
81bb6887f2
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
zxc
|
7035a1e8a4
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
yinzuomei
|
47efb5b3aa
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
2af0f4f38f
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
910cd64bb3
|
sql脚本
|
4 years ago |
|
yinzuomei
|
c693eaf8b6
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
8c10146af4
|
pc录入需求时，展示正常显示的居民
|
4 years ago |
wangxianzhang
|
0d19ab0b5a
|
Merge branches 'develop' and 'wxz_blockchain' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
b816a90c1c
|
修改：
项目结案的时候将项目最新信息发送到区块链系统
|
4 years ago |
|
yinzuomei
|
54e8d728a2
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
2a2b256c23
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
# Conflicts:
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
4 years ago |
|
yinzuomei
|
714b14470e
|
Merge branches 'dev' and 'dev_ic_diaodong' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_diaodong
Conflicts:
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
e5e037db13
|
Merge branches 'dev' and 'wxz_blockchain' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_blockchain
|
4 years ago |
|
sunyuchao
|
d60c163410
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
a976335bac
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
94f15fa651
|
居民列表不查询调出客户外的人员
|
4 years ago |
|
jianjun
|
6e0949e402
|
Merge branch 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
3d8da0b084
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
607d018af1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
09dfcc284f
|
添加 获取网格工作人员接口 加上客户Id
|
4 years ago |
|
zxc
|
4b4f172723
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
5f1cc671db
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
|
4 years ago |
|
yinzuomei
|
56b05896e2
|
注释url
|
4 years ago |
|
yinzuomei
|
ef4883c76b
|
注释url
|
4 years ago |
|
zxc
|
7080ac096c
|
地址
|
4 years ago |
|
yinzuomei
|
b46fc9dddb
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
ad0648b803
|
注释url
|
4 years ago |
|
zxc
|
2fcbbbab9d
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
c46606b2b4
|
分类renshu
|
4 years ago |
|
jianjun
|
d7a085d0df
|
添加 获取网格工作人员接口 -》目前是给平阴集成平台使用 总数不对
|
4 years ago |
|
yinzuomei
|
acc57378b9
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
cf7593dd75
|
暂时注释掉需求
|
4 years ago |
|
jianjun
|
2c6c332c8e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
zxc
|
79de7851cf
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
6679c3c6fe
|
分类
|
4 years ago |
|
wangxianzhang
|
40d0324951
|
Merge branches 'dev_ic_diaodong' and 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
Conflicts:
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
|
4 years ago |
