# Conflicts: # .idea/encodings.xml # .idea/uiDesigner.xml # bwie-common/src/main/java/com/bwie/common/domain/Group.java # bwie-common/src/main/java/com/bwie/common/domain/SeeHouse.java # bwie-common/src/main/java/com/bwie/common/domain/User.java # bwie-common/src/main/java/com/bwie/common/domain/request/GroupRequest.java # bwie-common/src/main/java/com/bwie/common/domain/request/SeeHouseRequest.java |
||
---|---|---|
.idea | ||
bwie-auth | ||
bwie-common | ||
bwie-gateway | ||
bwie-modules | ||
.gitignore | ||
pom.xml |