潘钊 / bsth_control · Commits

Commit f5c88b2bfcf3ce9b417ed01f37fdd694bc431e35

Authored by 王通
2 parents acb0370e cccd1d92
build: skipped

Merge branch 'pudong' into minhang 

# Conflicts:
#	src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
#	src/main/java/com/bsth/repository/sys/ResourceRepository.java
#	src/main/java/com/bsth/service/sys/impl/RoleServiceImpl.java
#	src/main/resources/application-prod.properties
#	src/main/resources/static/pages/permission/resource/list.html
#	src/main/resources/traffic-jdbc.properties
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at