zxc
|
0520432a24
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
zxc
|
cb118f48b3
|
bug
|
4 years ago |
|
zxc
|
667c7ded8c
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
zxc
|
0ac45e280e
|
地图
|
4 years ago |
zhaoqifeng
|
e03b7adea7
|
小区单元楼栋等自动生成代码
|
4 years ago |
|
zhaoqifeng
|
d1d3b09fbd
|
项目上报添加projectCreator
|
4 years ago |
|
zhaoqifeng
|
8f099eb6b4
|
中间表生成文件
|
4 years ago |
jianjun
|
bea3355120
|
Revert "暂时住掉发送"
This reverts commit 46afef7a
|
4 years ago |
|
jianjun
|
122c80f830
|
Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into dev
|
4 years ago |
|
jianjun
|
46afef7afa
|
暂时住掉发送
|
4 years ago |
sunyuchao
|
df2e444b19
|
调整引用问题
|
4 years ago |
|
zhaoqifeng
|
f4f7ca03b5
|
事件上报修改
|
4 years ago |
wangxianzhang
|
f965f9ec62
|
解决代码冲突
|
4 years ago |
|
wangxianzhang
|
fec2de9c45
|
Merge branches 'dev' and 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
sunyuchao
|
28fde7aa7f
|
Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
|
4 years ago |
|
sunyuchao
|
be0de5d61c
|
加字段
|
4 years ago |
yinzuomei
|
603bde674e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
e018395667
|
warn
|
4 years ago |
|
zxc
|
10e3359fae
|
emm
|
4 years ago |
|
zxc
|
920b476cad
|
项目分类统计修改父客户存在和不存在的分类方法
|
4 years ago |
|
zhaoqifeng
|
550f2ef032
|
Merge branch 'dev_grid_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
1cf71d92fd
|
事件上报添加部门网格ID
|
4 years ago |
|
zhaoqifeng
|
1d2bed6a83
|
Merge branch 'dev_grid_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
c5f00e1aac
|
事件上报添加部门网格ID
|
4 years ago |
|
sunyuchao
|
207ae7e5d4
|
Merge branch 'dev_grid_platform' into develop
|
4 years ago |
|
sunyuchao
|
6a2c891acf
|
错提url修改
|
4 years ago |
|
zhaoqifeng
|
7a055f3d22
|
Merge branch 'dev_grid_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
2ebfc657f1
|
事件上报添加部门网格ID
|
4 years ago |
|
sunyuchao
|
f8eb5a6a3e
|
...
|
4 years ago |
|
sunyuchao
|
bae3ba9b2b
|
Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
# Conflicts:
# epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExDeptDao.java
# epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
# epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
|
4 years ago |
|
sunyuchao
|
2e8f1b997f
|
组织网格数据同步
|
4 years ago |
|
yinzuomei
|
15e1c0bf88
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
8f3e2dc521
|
暂时放开error
|
4 years ago |
|
zhaoqifeng
|
7b69ae0bdf
|
Merge branch 'dev_grid_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
32bd1cbde9
|
事件上报添加部门网格ID
|
4 years ago |
|
jianjun
|
7c58ab9c19
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
zhaoqifeng
|
5320b28c63
|
Merge branch 'dev_grid_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
7497421203
|
事件上报添加部门网格ID
|
4 years ago |
|
zhaoqifeng
|
0584eee78c
|
Merge branch 'dev_grid_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
4766365f75
|
事件上报
|
4 years ago |
|
wangxianzhang
|
a213e319ff
|
Merge branches 'develop' and 'wxz_job_tran_serial' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
6a4f8f5529
|
修改：
1.epmet-common-tools模块中，将FeignConfig.java做了调整，RequestInterceptor的实例化逻辑做了调整。允许依赖epmet-common-tools的客户端自定义RequestInterceptor
2.job服务增加了自己的RequestInterceptor，用于生成tran-serial
|
4 years ago |
|
zhaoqifeng
|
f3305088c2
|
Merge branch 'dev_grid_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
21733738da
|
办结组织和办结层级设定
|
4 years ago |
|
wxz
|
66cc07e3c4
|
Merge branches 'dev' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wxz
|
073f1aa456
|
Merge branches 'dev' and 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wxz
|
a84edc743b
|
Merge branches 'dev' and 'dev_dim_addcode' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
zhaoqifeng
|
eb0a132da2
|
事件上报发送MQ消息
|
4 years ago |
|
jianjun
|
8d22c9f6c8
|
Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into develop
|
4 years ago |
|
jianjun
|
fcdef1d2e7
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
