潘钊 / bsth_control · Commits

Commit ad1b89858f7a88e250f8ee1c35f32b4ec6bb8f18

Authored by 潘钊
2 parents 919d2d82 91d5efdc
build: skipped

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang 

# Conflicts:
#	src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
#	src/main/java/com/bsth/data/schedule/edit_logs/SeiPstThread.java
#	src/main/java/com/bsth/data/schedule/edit_logs/entity/EditType.java
#	src/main/java/com/bsth/data/schedule/edit_logs/entity/SchEditInfo.java
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at