Browse code Merge remote-tracking branch 'origin/develop' into develop Conflicts: .idea/workspace.xml ~$数据库设计说明新需求.docx 管廊数据库设计说明新需求.docx develop
1 parent 8cd60f9 commit 165720941e1063851027c833e62d245a00ea3e42 xiaowei authored on 3 Apr 2018

Showing 23 changed files

• .idea/artifacts/PgInterface.xml
• .idea/misc.xml
• .idea/workspace.xml
• PgInterface.iml
• src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
• src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java
• src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java
• src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
• src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java
• src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
• src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
• src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
• src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
• src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
• src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
• src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
• src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
• src/main/java/com/casic/PgInterface/rs/PgReserveController.java
• src/main/java/com/casic/PgInterface/rs/test.java
• src/main/resources/application.properties
• ~$口说明新需求.docx
• ~$数据库设计说明新需求.docx
• ~WRL1033.tmp

Ignore Space Show notes View .idea/artifacts/PgInterface.xml

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View .idea/workspace.xml

Ignore Space Show notes View PgInterface.iml

Show notes View src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java 100644 → 0

Show notes View src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java 100644 → 0

Show notes View src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java 100644 → 0

Show notes View src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java 100644 → 0

Show notes View src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java 100644 → 0

Show notes View src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java 100644 → 0

Show notes View src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java 100644 → 0

Ignore Space Show notes View src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java

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

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

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

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

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/PgReserveController.java

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

Ignore Space Show notes View src/main/resources/application.properties

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

Ignore Space Show notes View ~$数据库设计说明新需求.docx

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

Show line notes below