jianjun
|
a078876d38
|
例行工作 漏掉了一个字段 up
|
4 years ago |
|
jianjun
|
e2c6f3bf8a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
92a0354b4c
|
Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into dev
|
4 years ago |
|
jianjun
|
e740e54d73
|
例行工作 漏掉了一个字段
|
4 years ago |
|
jianjun
|
a0e1abec83
|
例行工作 添加2个字段
|
4 years ago |
|
jianjun
|
e674164ea8
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
dc9a7df275
|
Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into dev
|
4 years ago |
|
jianjun
|
d32f970d95
|
12312312
|
4 years ago |
|
jianjun
|
c675949712
|
脚本错误
|
4 years ago |
|
jianjun
|
244b6552e1
|
例行工作添加 字段类型调整
|
4 years ago |
|
jianjun
|
251325d9a7
|
例行工作添加 字段类型调整
|
4 years ago |
|
jianjun
|
b40a1f20dd
|
例行工作添加 字段脚本
|
4 years ago |
|
jianjun
|
0b2438ac41
|
例行工作添加 字段
|
4 years ago |
|
jianjun
|
53730d0bf9
|
把字典表的两个表改成我们这种结构的2 up
|
4 years ago |
|
jianjun
|
91b0855602
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
95c451f328
|
把字典表的两个表改成我们这种结构的2 up
|
4 years ago |
|
jianjun
|
4b8a6d36f1
|
把字典表的两个表改成我们这种结构的2
|
4 years ago |
|
jianjun
|
d8b72c3758
|
把字典表的两个表改成我们这种结构的
|
4 years ago |
|
jianjun
|
7f9e3e483b
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
c8c4544a99
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
27be013b2d
|
日志级别调整
|
4 years ago |
|
jianjun
|
0563b38102
|
日志级别调整
|
4 years ago |
|
jianjun
|
56429b2e57
|
去掉默认赋值根组织中心点 up
|
4 years ago |
|
jianjun
|
208ac9c450
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
764dce2a4a
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
722f3dfcac
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
1c87a9d0b8
|
去掉默认赋值根组织中心点
|
4 years ago |
wangxianzhang
|
2c0c5c5c91
|
版本升级
|
4 years ago |
|
wangxianzhang
|
db363b1e05
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
b2e8150e7c
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
74bead90a2
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
56ceafd039
|
fix
|
4 years ago |
|
jianjun
|
1385830337
|
例行工作阶段1 up
|
4 years ago |
|
jianjun
|
95b813ae22
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
aa21130bf9
|
Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into dev
|
4 years ago |
|
wangxianzhang
|
2b8875183d
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
wangxianzhang
|
d46ac4de41
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
wangxianzhang
|
e3bfd50fde
|
修改：
三个接口customerId参数的使用逻辑调整
|
4 years ago |
|
jianjun
|
228e27f60e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
# epmet-module/data-report/data-report-server/pom.xml
|
4 years ago |
|
jianjun
|
e1d047ffa3
|
组织及网格去掉 默认跟组织的中心点
|
4 years ago |
|
jianjun
|
f0c71b4cab
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
Conflicts:
epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
epmet-module/data-report/data-report-server/pom.xml
|
4 years ago |
|
jianjun
|
beac655851
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
4b0264ef65
|
去掉 默认跟组织的中心点
|
4 years ago |
|
wangxianzhang
|
0db2588a93
|
版本升级
|
4 years ago |
|
wangxianzhang
|
6360128fd2
|
Merge branch 'dev'
# Conflicts:
# epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
# epmet-module/data-report/data-report-server/pom.xml
|
4 years ago |
|
wangxianzhang
|
5efb0bf3e1
|
版本升级
|
4 years ago |
|
wangxianzhang
|
0bcb12f842
|
修改：
/screen/index/advancedbranchrank
report/screen/user/partypointrank
user/userpointrank/withoutpartymember
增加customerId可选参数
|
4 years ago |
|
wangxianzhang
|
51a5a02319
|
版本升级
|
4 years ago |
|
wangxianzhang
|
4db520285a
|
Merge branch 'dev'
|
4 years ago |
|
wangxianzhang
|
a3d299884b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
