Commit 93a5e2440181cf855badbad49668303a3ff134cf

Authored by ljq
2 parents b292d514 37a1d1c0

Merge remote-tracking branch 'origin/school_control' into school_control

# Conflicts:
#	src/main/java/com/bsth/entity/subject/SubjectUser.java
#	src/main/java/com/bsth/repository/subject/SubjectUserRepository.java
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at