wangxianzhang
|
27362b45cb
|
修改：
auth的serviceListChangedListening选项忘记配置到yml中
|
4 years ago |
jianjun
|
72f08c88e9
|
数据3版 删掉已经执行的sql up
|
4 years ago |
|
jianjun
|
2525ed03d6
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
393ce22f97
|
数据3版 删掉已经执行的sql
|
4 years ago |
|
jianjun
|
79ca678e0a
|
数据3版 上线漏掉的服务
|
4 years ago |
|
wangxianzhang
|
d4c452ce94
|
版本升级
|
4 years ago |
sunyuchao
|
d333beb9bc
|
组织、部门、网格添加编码、负责人、电话、网格类型字段
|
4 years ago |
|
jianjun
|
b3efd84077
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
b557ce76ce
|
巡查记录
|
4 years ago |
|
wangxianzhang
|
33bd9729dc
|
版本升级
|
4 years ago |
|
wangxianzhang
|
085c9d37c5
|
版本升级
|
4 years ago |
|
wangxianzhang
|
da911051ce
|
Merge branch 'dev'
|
4 years ago |
|
wangxianzhang
|
b26621f899
|
1
|
4 years ago |
|
jianjun
|
44c888f06b
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
jianjun
|
2ff54d1343
|
数据分析v3 漏掉服务report 加上
|
4 years ago |
|
wangxianzhang
|
b4062edd7b
|
版本升级
|
4 years ago |
|
wangxianzhang
|
02fe2fd0c2
|
Merge branch 'dev'
|
4 years ago |
|
jianjun
|
b9351a262d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
f2b8ab3ffc
|
巡查记录添加地址设置
|
4 years ago |
|
wangxianzhang
|
ccdbe0818e
|
修改：
1.因为错误的分之合并，将区块链分支合并到了线上分支，暂时屏蔽掉具体处理，只接受参数
|
4 years ago |
|
jianjun
|
8533026157
|
数据分析v3 up
|
4 years ago |
|
jianjun
|
d77cb8bcb3
|
数据分析v3 up
|
4 years ago |
|
jianjun
|
3447204d32
|
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts:
# epmet-module/oper-customize/oper-customize-server/pom.xml
|
4 years ago |
|
jianjun
|
ab5f11c2e5
|
Merge remote-tracking branch 'remotes/origin/dev_ic_data' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
|
wangxianzhang
|
aafeb78854
|
Merge branch 'dev_resi_template_download' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
|
wangxianzhang
|
31aa37d650
|
新增：
1.ic居民信息导入所用excel模板下载
|
4 years ago |
zxc
|
16c4a9b7d8
|
统计升级
|
4 years ago |
|
zxc
|
9e848d1fcc
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
2efeec31ed
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
d8cefaf5de
|
来源网格的，已结案的项目，满意度分数默认80
|
4 years ago |
|
wangxianzhang
|
ca068bdff3
|
Merge branch 'dev' into dev_ic_data
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
08322393ac
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
a406d0e22c
|
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/service/impl/ProjectServiceImpl.java
|
4 years ago |
|
jianjun
|
57450e688b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
0e58294aae
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
9dec466f4c
|
组织中心点位获取 up
|
4 years ago |
|
jianjun
|
14c6dee3ee
|
组织中心点位获取 up
|
4 years ago |
|
jianjun
|
e75c6f8fda
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
jianjun
|
26018dd35f
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
f2b26d1e2f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3e0b7a4434
|
组织中心点位获取
|
4 years ago |
|
wangxianzhang
|
aaad6d71bc
|
版本升级
|
4 years ago |
|
wangxianzhang
|
5c976afcaf
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
40cfae724a
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
02002fe33f
|
修改居民excel导入后的文件名
|
4 years ago |
zhaoqifeng
|
42e5f85892
|
服务升级
|
4 years ago |
|
zhaoqifeng
|
1c07a3a3c9
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
f6b73d099b
|
Merge branch 'dev_agency_govern_daily' into dev
|
4 years ago |
|
zhaoqifeng
|
22fa5550f7
|
治理指数统计修改
|
4 years ago |
|
jianjun
|
65c8ee4f22
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
