-
minhang # Conflicts: # src/main/java/com/bsth/data/schedule/DayOfSchedule.java # src/main/resources/static/assets/plugins/fileinput/fileinput.min.js # src/main/resources/static/assets/plugins/fileinput/purify.min.js # src/main/resources/static/assets/plugins/fileinput/sortable.min.js # src/main/resources/static/real_control_v2/fragments/north/nav/tts_config.html # src/main/resources/static/real_control_v2/js/utils/tts.js
-
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang # Conflicts: # src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
-
minhang # Conflicts: # src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java