wangchao
|
342715a9f9
|
用户缓存信息查找注册记录传入customerId
|
5 years ago |
yinzuomei
|
9d2fdf2f54
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
yinzuomei
|
d6159da682
|
merge
|
5 years ago |
|
yinzuomei
|
37087387cd
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectProcessService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
|
5 years ago |
|
yinzuomei
|
093e33c22a
|
数据采集添加通用参数校验
|
5 years ago |
|
yinzuomei
|
8595a1d688
|
安宁数据采集接口添加验证
|
5 years ago |
zxc
|
9c9ca2e643
|
Merge remote-tracking branch 'origin/dev_badge_log_20210315' into dev_temp
|
5 years ago |
|
zxc
|
62e68b5d23
|
徽章bug测试
|
5 years ago |
wxz
|
0d4a1ee11e
|
完成ApiService体系设计，准备接入具体的平台
|
5 years ago |
|
zxc
|
684e4d458d
|
Merge remote-tracking branch 'origin/dev_badge_log_20210315' into dev_temp
|
5 years ago |
|
zxc
|
68817f0770
|
徽章bug测试
|
5 years ago |
sunyuchao
|
8fa4320419
|
Merge branch 'dev_add_customer_id' into dev_temp
|
5 years ago |
|
sunyuchao
|
f1ffb73dd9
|
居民端首页设置 customer_home_detail表客户Id未赋值情况
|
5 years ago |
|
wxz
|
e0e4e74e04
|
Merge branch 'dev_add_customer_id' into dev_temp
|
5 years ago |
|
wxz
|
bec8d7e9c3
|
saveconfig和saveroleopes接口，增加customerId
|
5 years ago |
|
zxc
|
5bf7be71c5
|
Merge remote-tracking branch 'origin/dev_badge_log_20210315' into dev_temp
|
5 years ago |
|
zxc
|
5b9a756015
|
徽章信息插入加log日志
|
5 years ago |
|
zxc
|
8c5ffb9209
|
徽章信息插入加log日志
|
5 years ago |
|
zxc
|
875b87cf1d
|
徽章信息插入加log日志
|
5 years ago |
|
zxc
|
4b89f75cca
|
Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_temp
|
5 years ago |
|
zxc
|
e1a415720a
|
赋值customerId
|
5 years ago |
|
zxc
|
becdef0863
|
Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_temp
|
5 years ago |
|
zxc
|
fd8a83dd0a
|
customerId修改
|
5 years ago |
zhangyongzhangyong
|
a036bf5c88
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
zhangyongzhangyong
|
5fc0171e88
|
Merge remote-tracking branch 'origin/dev-customerfunction' into dev_temp
|
5 years ago |
|
zxc
|
ac3c5f03bf
|
Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_temp
|
5 years ago |
|
zxc
|
e2c870b89d
|
customerId修改
|
5 years ago |
|
yinzuomei
|
83cf24ac70
|
Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp
|
5 years ago |
|
yinzuomei
|
5cb26abf59
|
Merge branches 'dev' and 'dev_pyscreenv2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreenv2
|
5 years ago |
|
zhangyongzhangyong
|
2d5e64b207
|
客户定制功能修改，追加修改范围：业务域名、外链地址
|
5 years ago |
|
zxc
|
32b88291ed
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev
|
5 years ago |
|
zxc
|
453328d353
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
zxc
|
4a3ca383cc
|
平阴数据
|
5 years ago |
|
zxc
|
741c6e8eaf
|
平阴数据
|
5 years ago |
|
wangchao
|
85fb82d0ba
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wangchao
|
96c6cb3945
|
Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp
|
5 years ago |
|
wangchao
|
6e0c2d6b8a
|
screenProjectData
|
5 years ago |
|
yinzuomei
|
69b47c0c51
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
wangchao
|
4f476bafcd
|
Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp
|
5 years ago |
|
wangchao
|
43bc61f844
|
screenProjectData
|
5 years ago |
|
sunyuchao
|
30a23991c5
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
sunyuchao
|
a37bf10292
|
暂时关闭开发和测试环境运营端登陆的验证码验证
|
5 years ago |
|
yinzuomei
|
cff6601188
|
/epmet/ext/staff/permissionv2接口修改
|
5 years ago |
|
wangchao
|
d40a08eb3c
|
Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp
|
5 years ago |
|
wangchao
|
8e4318e956
|
screenProjectData
|
5 years ago |
|
wangchao
|
72fad2966a
|
Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp
|
5 years ago |
|
wangchao
|
020888f4e4
|
screenProjectData
|
5 years ago |
|
wangchao
|
12c20863da
|
Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp
|
5 years ago |
|
wangchao
|
a713e4bef5
|
screenProjectData
|
5 years ago |
|
wangchao
|
241326e39e
|
Merge branch 'dev_bugfix_user_cache' into dev
|
5 years ago |
