# Conflicts:
#	after-sale-service/src/main/java/com/ssy/lingxi/after/sale/serviceimpl/ReturnGoodsServiceImpl.java
#	common/src/main/java/com/ssy/lingxi/common/response/ResponseCode.java
#	merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/entity/MemberRoleDO.java
#	merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberAbilityRoleServiceImpl.java
#	order-service/src/main/java/com/ssy/lingxi/order/controller/PurchaseOrderController.java
#	product-service/src/main/java/com/ssy/lingxi/product/utils/RedisLockUtil.java
#	purchase-service/src/main/resources/application-kubernetes.yml
#	purchase-service/src/main/resources/logback-k8s.xml
#	purchase-service/src/main/resources/redisson-single-kubernetes.yml