yinzuomei
|
4a564833ae
|
NumConstant
|
5 years ago |
|
yinzuomei
|
9d0a709127
|
Merge branches 'dev' and 'dev_pyscreenv2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreenv2
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
|
b686e35cdc
|
stat+1:参数校验升级
|
5 years ago |
|
yinzuomei
|
1404c2c913
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
10041622ea
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev
|
5 years ago |
wangchao
|
45df6641eb
|
screenProjectData
|
5 years ago |
zxc
|
58601542f4
|
user服务升级
|
5 years ago |
|
zxc
|
66e0afe429
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
wangchao
|
10c5545420
|
Merge remote-tracking branch 'origin/dev_badge_log_20210315' into dev_badge_log_20210315
|
5 years ago |
|
wangchao
|
e6a74e72ac
|
用户注册党员连带认证居民时先插入register_relation再更新缓存
|
5 years ago |
|
zxc
|
c677cabeba
|
徽章bug测试
|
5 years ago |
|
yinzuomei
|
093e33c22a
|
数据采集添加通用参数校验
|
5 years ago |
|
yinzuomei
|
8595a1d688
|
安宁数据采集接口添加验证
|
5 years ago |
|
zxc
|
62e68b5d23
|
徽章bug测试
|
5 years ago |
|
zxc
|
68817f0770
|
徽章bug测试
|
5 years ago |
|
zxc
|
8922a9f11f
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
zxc
|
5b9a756015
|
徽章信息插入加log日志
|
5 years ago |
|
zxc
|
8c5ffb9209
|
徽章信息插入加log日志
|
5 years ago |
|
zxc
|
1f39246867
|
user服务升级
|
5 years ago |
|
zxc
|
3d9f4b7af4
|
Merge remote-tracking branch 'origin/dev_badge_log_20210315'
|
5 years ago |
|
zxc
|
875b87cf1d
|
徽章信息插入加log日志
|
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 |
|
zxc
|
7d26e56010
|
统计服务升级
|
5 years ago |
|
zxc
|
45ee741bdd
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
zxc
|
32b88291ed
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev
|
5 years ago |
|
zxc
|
4a3ca383cc
|
平阴数据
|
5 years ago |
|
zxc
|
741c6e8eaf
|
平阴数据
|
5 years ago |
|
wangchao
|
6e0c2d6b8a
|
screenProjectData
|
5 years ago |
|
wangchao
|
43bc61f844
|
screenProjectData
|
5 years ago |
|
yinzuomei
|
cff6601188
|
/epmet/ext/staff/permissionv2接口修改
|
5 years ago |
|
wangchao
|
8e4318e956
|
screenProjectData
|
5 years ago |
|
wangchao
|
020888f4e4
|
screenProjectData
|
5 years ago |
|
wangchao
|
a713e4bef5
|
screenProjectData
|
5 years ago |
|
wangchao
|
6c7d557dbb
|
user 升级 145
|
5 years ago |
|
wangchao
|
43a243f03d
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
wangchao
|
241326e39e
|
Merge branch 'dev_bugfix_user_cache' into dev
|
5 years ago |
|
wangchao
|
7193a584bd
|
extUserInfo 返回加上customerId
|
5 years ago |
|
wangchao
|
7df97b77db
|
用户注册记录查询，保证一个用户最多只返回一条数据
|
5 years ago |
|
zxc
|
91de688106
|
统计服务升级
|
5 years ago |
|
zxc
|
9d261c328e
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
zxc
|
5a692350f4
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev
|
5 years ago |
|
zxc
|
9693fd1f77
|
平阴数据
|
5 years ago |
jianjun
|
b8793ac1c4
|
升级auth：配置生产环境 jcet g端
|
5 years ago |
|
jianjun
|
f8050d3a52
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
510dec45ea
|
配置生产环境 jcet g端
|
5 years ago |
|
jianjun
|
f38008006a
|
升级+：工作Pc版 密码加密；我的建议 手机号验证
|
5 years ago |
|
jianjun
|
7d881f1a40
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
bde0eda16c
|
Merge remote-tracking branch 'remotes/origin/dev_lw_bugfix' into dev
|
5 years ago |
|
zxc
|
4009a66d23
|
统计服务升级
|
5 years ago |
|
zxc
|
61d126137a
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
