Merge branch 'develop' of http://192.168.0.203:8080/gitbucket/git/root/PgInterface into develop

Fork: 0

codedev / PgInterface

Browse code Merge branch 'develop' of http://192.168.0.203:8080/gitbucket/git/root/PgInterface into develop Conflicts: .idea/workspace.xml src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java ~$数据库设计说明新需求.docx 管廊数据库设计说明新需求.docx develop
commit e5f16c7d585259e6319a0e758b46c5d960f08af9 2 parents 039aec9 + 4326bcf zhuxiaohan authored on 3 Apr 2018

Browse code

Conflicts:
	.idea/workspace.xml
	src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
	src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
	~$数据库设计说明新需求.docx
	管廊数据库设计说明新需求.docx

develop

commit e5f16c7d585259e6319a0e758b46c5d960f08af9

2 parents 039aec9 + 4326bcf

zhuxiaohan authored on 3 Apr 2018

Patch

Unified Split

Showing 54 changed files

Ignore Space Show notes View .idea/workspace.xml

Ignore Space Show notes View src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java

Show notes View src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java 100644 → 0

Ignore Space Show notes View src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java 0 → 100644

Show notes View src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java 100644 → 0

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java 0 → 100644

Show notes View src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java 100644 → 0

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java 0 → 100644

Show notes View src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java 100644 → 0

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java 0 → 100644

Show notes View src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java 100644 → 0

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgLogRs.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java 0 → 100644

Show notes View src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java 100644 → 0

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgReserveController.java

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgRoleRs.java 0 → 100644

Ignore Space Show notes View src/main/java/com/casic/PgInterface/rs/PgUserRs.java 0 → 100644

Ignore Space Show notes View ~$口说明新需求.docx 0 → 100644
Not supported

Ignore Space Show notes View ~WRL1033.tmp 0 → 100644
Not supported

Ignore Space Show notes View 接口说明新需求.docx
Not supported

Show line notes below