# Conflicts:
#	xx-order/xx-order-server/src/test/java/ServiceTest.java

# Conflicts:
#	xx-order/xx-order-server/src/test/java/ServiceTest.java

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java
#	xx-order/xx-order-server/src/test/java/ServiceTest.java

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java