yinzuomei
|
8b8df4648f
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
sunyuchao
|
5879f74dd7
|
Merge branch 'dev_ic_mp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
0ce1b0a8b8
|
sql优化
|
4 years ago |
zxc
|
9b82cd8e4d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
d60e31ce99
|
字段名
|
4 years ago |
zhaoqifeng
|
8eb27230c9
|
Merge branch 'dev_ic_mp' into develop
|
4 years ago |
|
zhaoqifeng
|
083cf37f38
|
活动相关接口
|
4 years ago |
|
zxc
|
0b4c38bd2d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
4696132e0e
|
emm 缓存
|
4 years ago |
|
sunyuchao
|
2bfc6f7ae7
|
Merge branch 'dev_ic_mp' into develop
|
4 years ago |
|
sunyuchao
|
1c35c0dedc
|
网格类型字典
|
4 years ago |
wangxianzhang
|
a455cf9002
|
Merge branch 'wxz_dim_sync' into release_temp
|
4 years ago |
|
wangxianzhang
|
9bbce77606
|
Merge branch 'wxz_dim_sync' into develop
|
4 years ago |
|
wangxianzhang
|
5dd50c7c37
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_dim_sync
|
4 years ago |
|
wangxianzhang
|
0412c9e5e8
|
修改：
1.维度同步，internal&external
|
4 years ago |
|
wangxianzhang
|
a6d743e955
|
Merge branch 'wxz_dim_sync' into release_temp
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
|
4 years ago |
|
sunyuchao
|
6e19f175a1
|
Merge branch 'dev_ic_mp' into develop
|
4 years ago |
|
sunyuchao
|
4d3506b7cd
|
引入路径
|
4 years ago |
|
zxc
|
7ac2475d28
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
zxc
|
00a098be8b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
e780fd7853
|
a
|
4 years ago |
|
sunyuchao
|
fcfc9e50c3
|
引入路径
|
4 years ago |
|
zxc
|
b2e8c80e46
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
sunyuchao
|
987301ce28
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
4c245f3092
|
进网格接口增加网格经纬度返参
|
4 years ago |
|
zxc
|
ce31b7f57a
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
zxc
|
82fbccf709
|
新增详情
|
4 years ago |
|
wangxianzhang
|
70911cc615
|
Merge remote-tracking branch 'origin/wxz_dim_sync' into develop
|
4 years ago |
|
wangxianzhang
|
1498870a88
|
修改：
1.指标库维度同步，优化，新增的时候判断是否存在，存在的话则执行修改
|
4 years ago |
jianjun
|
854dbb41fd
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
e9a1162f04
|
项目实时抽取 添加参数projectId
|
4 years ago |
|
zxc
|
dbe58e4e34
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
sunyuchao
|
6dbcabc347
|
垃圾
|
4 years ago |
|
zxc
|
da94759408
|
douhao
|
4 years ago |
|
zxc
|
b1cdcccab1
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
zxc
|
2bcacf46ce
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
5da3b40d93
|
douhao
|
4 years ago |
|
jianjun
|
7e46dbed84
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
e6371512f1
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
9ab37a1e3d
|
去掉没用的参数
|
4 years ago |
|
zxc
|
502727f37b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
addf625b08
|
表决调整
|
4 years ago |
|
jianjun
|
9a1e45e293
|
微调
|
4 years ago |
|
yinzuomei
|
e499e8a9ab
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
2439adcfd5
|
test
|
4 years ago |
|
jianjun
|
1f1cb6637e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
|
4 years ago |
|
jianjun
|
859e283bf8
|
实时抽取项目数据部分 添加 objectid有针对性的处理数据 extractProjectPeriodData,extractProjectCategory部分修改完毕
|
4 years ago |
|
yinzuomei
|
630d19c101
|
服务完成pc和小程序通用
|
4 years ago |
|
yinzuomei
|
ff1f7ea0f6
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
34b48a1cc4
|
我的需求被指派。应该通知我。
|
4 years ago |
