jianjun
|
3baffe6e8f
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
4b68d8418a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
7f0e50982d
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
70d621c3c4
|
Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
2ec966f7aa
|
如果项目只选择了一级分类 默认给第一个二级分类
|
4 years ago |
zhaoqifeng
|
0358f41bb6
|
治理能力统计修改
|
4 years ago |
yinzuomei
|
e143af2701
|
Merge branches 'dev' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_v2
|
4 years ago |
|
yinzuomei
|
aac87f7d0d
|
列表和详情需要返回一级分类编码和一级分类名称
|
4 years ago |
|
jianjun
|
2ed5d322ee
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
7efe46fa04
|
列表和详情需要返回一级分类编码和一级分类名称
|
4 years ago |
|
yinzuomei
|
42dc117de6
|
修改服务措施列表查询，需求详情
|
4 years ago |
wangxianzhang
|
c42a8e9027
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_blockchain
|
4 years ago |
|
yinzuomei
|
492bf3e879
|
服务措施列表改查admin
|
4 years ago |
zxc
|
93d8e766d8
|
data-agg,user升级
|
4 years ago |
|
zxc
|
ebe66fcaa7
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
69992d881b
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
6993da3c69
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
a11afbc849
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
37d49501aa
|
agg的entity添加字段
|
4 years ago |
|
zxc
|
3b4c4691b2
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
b184cfb742
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
f866031d1b
|
添加新字段
|
4 years ago |
|
jianjun
|
0dcc92426d
|
添加解释文档
|
4 years ago |
|
zxc
|
6de248c201
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
fa79271551
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
aec76ff8a6
|
edit
|
4 years ago |
|
zxc
|
ff44cd159e
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
0cbbea19ca
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
ac9ee002e3
|
emm
|
4 years ago |
|
yinzuomei
|
ccb916c607
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
yinzuomei
|
a867827594
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
fe4bc4c6b9
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
e599c270f8
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
8057dcba8e
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
zxc
|
680dcf2856
|
edit
|
4 years ago |
|
yinzuomei
|
afda967351
|
"branchoption"接口注释error
|
4 years ago |
|
zxc
|
91b4384b1b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
be5767c4fa
|
sql
|
4 years ago |
|
zxc
|
bba5c66b71
|
是否手动结束
|
4 years ago |
|
zxc
|
721ba67c5b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
e7d56433e5
|
是否手动结束巡查添加
|
4 years ago |
|
jianjun
|
f843b3cf4d
|
网格议题转项目率 修改为：议题创建时间 而不是转项目的时间+区直部门日期参数修改 up
|
4 years ago |
|
jianjun
|
b6aa9b852c
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
ab9e5609a6
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
92ba0f04c3
|
区直部门治理能力修改
|
4 years ago |
|
zhaoqifeng
|
2f4d1f8993
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
zhaoqifeng
|
935b372a67
|
区直部门治理能力修改
|
4 years ago |
|
jianjun
|
c2faf9bc50
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
942869a3f4
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
db2d03b10d
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
