# Conflicts: # mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java # mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java |
||
---|---|---|
.. | ||
src/main/java/com/mcwl/common | ||
pom.xml |
# Conflicts: # mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java # mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java |
||
---|---|---|
.. | ||
src/main/java/com/mcwl/common | ||
pom.xml |