Conversation
…igence_classroom # Conflicts: # wisdom_common/target/maven-archiver/pom.properties # wisdom_common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst # wisdom_common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst # wisdom_common/target/wisdom_common.jar # wisdom_manager/wisdom_manager_dao/target/maven-archiver/pom.properties # wisdom_manager/wisdom_manager_dao/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst # wisdom_manager/wisdom_manager_dao/target/wisdom_manager_dao.jar # wisdom_manager/wisdom_manager_interface/target/maven-archiver/pom.properties # wisdom_manager/wisdom_manager_interface/target/wisdom_manager_interface.jar # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample.class # wisdom_manager/wisdom_manager_pojo/target/maven-archiver/pom.properties # wisdom_manager/wisdom_manager_pojo/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst # wisdom_manager/wisdom_manager_pojo/target/wisdom_manager_pojo.jar # wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-dao.xml # wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-service.xml # wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-transaction.xml # wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-dao.xml # wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-service.xml # wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-transaction.xml # wisdom_manager/wisdom_manager_service/target/maven-archiver/pom.properties # wisdom_manager/wisdom_manager_service/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.java # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service.war # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-dao.xml # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-service.xml # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-transaction.xml # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_common-1.0-SNAPSHOT.jar # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_dao-1.0-SNAPSHOT.jar # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_interface-1.0-SNAPSHOT.jar # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_pojo-1.0-SNAPSHOT.jar # wisdom_web/target/maven-archiver/pom.properties # wisdom_web/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.java # wisdom_web/target/wisdom_web.war # wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_common-1.0-SNAPSHOT.jar # wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_manager_interface-1.0-SNAPSHOT.jar # wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_manager_pojo-1.0-SNAPSHOT.jar # wisdom_web/wisdom_web.iml
…igence_classroom # Conflicts: # wisdom_common/target/maven-archiver/pom.properties # wisdom_common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst # wisdom_common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst # wisdom_common/target/wisdom_common.jar # wisdom_manager/wisdom_manager_dao/target/maven-archiver/pom.properties # wisdom_manager/wisdom_manager_dao/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst # wisdom_manager/wisdom_manager_dao/target/wisdom_manager_dao.jar # wisdom_manager/wisdom_manager_interface/target/maven-archiver/pom.properties # wisdom_manager/wisdom_manager_interface/target/wisdom_manager_interface.jar # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbAttendanceExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassitemExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbClassroomExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCollegeitemExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseClassExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseTeacherExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbCourseitemExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbOfficerExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbPositionExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbProfessionitemExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbStudentExample.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$Criteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$Criterion.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample$GeneratedCriteria.class # wisdom_manager/wisdom_manager_pojo/target/classes/com/smart/pojo/TbTeacherExample.class # wisdom_manager/wisdom_manager_pojo/target/maven-archiver/pom.properties # wisdom_manager/wisdom_manager_pojo/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst # wisdom_manager/wisdom_manager_pojo/target/wisdom_manager_pojo.jar # wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-dao.xml # wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-service.xml # wisdom_manager/wisdom_manager_service/src/main/resources/spring/applicationContext-transaction.xml # wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-dao.xml # wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-service.xml # wisdom_manager/wisdom_manager_service/target/classes/spring/applicationContext-transaction.xml # wisdom_manager/wisdom_manager_service/target/maven-archiver/pom.properties # wisdom_manager/wisdom_manager_service/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.java # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service.war # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-dao.xml # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-service.xml # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/classes/spring/applicationContext-transaction.xml # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_common-1.0-SNAPSHOT.jar # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_dao-1.0-SNAPSHOT.jar # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_interface-1.0-SNAPSHOT.jar # wisdom_manager/wisdom_manager_service/target/wisdom_manager_service/WEB-INF/lib/wisdom_manager_pojo-1.0-SNAPSHOT.jar # wisdom_web/target/maven-archiver/pom.properties # wisdom_web/target/tomcat/work/Tomcat/localhost/_/org/apache/jsp/index_jsp.java # wisdom_web/target/wisdom_web.war # wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_common-1.0-SNAPSHOT.jar # wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_manager_interface-1.0-SNAPSHOT.jar # wisdom_web/target/wisdom_web/WEB-INF/lib/wisdom_manager_pojo-1.0-SNAPSHOT.jar # wisdom_web/wisdom_web.iml
This reverts commit a2e90d6
This reverts commit a2e90d6
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.