yinzuomei
|
956a1932e6
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
yinzuomei
|
15f268db25
|
zancun
|
4 years ago |
wangxianzhang
|
553e9ab102
|
Merge branches 'dev_ic_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
b07ae98f61
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
wangxianzhang
|
9e135eda0a
|
修改：
修改登录dto字段名
|
4 years ago |
zhaoqifeng
|
74ae76b26c
|
网格小区楼栋房屋下拉框查询
|
4 years ago |
|
wangxianzhang
|
c9d3d866fe
|
Merge branches 'dev_ic_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
e53c459c26
|
修改：
去掉无效依赖
|
4 years ago |
|
wangxianzhang
|
f8ce7eb67a
|
新增：
1.【ic基层治理平台】登录相关接口
|
4 years ago |
|
yinzuomei
|
6964d4cae9
|
查询表单
|
4 years ago |
zxc
|
bb6e788772
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
zxc
|
309bf86fcf
|
添加组织级别
|
4 years ago |
sunyuchao
|
254676cbcd
|
方法模板
|
4 years ago |
|
sunyuchao
|
437acd3e90
|
代码生成
|
4 years ago |
|
zxc
|
7701e9f286
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
zxc
|
b32854c76d
|
a
|
4 years ago |
|
zxc
|
6e4721dd6c
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
zxc
|
f2778200ac
|
经纬度
|
4 years ago |
|
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 |
