Conflicts:
	after-sale-service/build.gradle
	after-sale-service/src/main/java/com/ssy/lingxi/after/sale/AfterSaleServiceApplication.java
	common/src/main/java/com/ssy/lingxi/common/response/ResponseCode.java
	marketing-service/src/main/java/com/ssy/lingxi/marketing/serviceimpl/PlatformActivitySignUpServiceImpl.java
	marketing-service/src/main/resources/application-all.yml
	marketing-service/src/main/resources/application-b2b.yml
	marketing-service/src/main/resources/application-demo.yml
	marketing-service/src/main/resources/application-dms.yml
	marketing-service/src/main/resources/application-kubernetes.yml
	marketing-service/src/main/resources/application-learn.yml
	marketing-service/src/main/resources/application-scm.yml
	marketing-service/src/main/resources/application-scm_v2.yml
	marketing-service/src/main/resources/application-test.yml
	marketing-service/src/main/resources/application-yxc.yml
	marketing-service/src/main/resources/application-yxcdev.yml
	merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/controller/web/MemberRegisterController.java
	merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/service/web/IMemberLoginService.java
	merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberLoginServiceImpl.java
	message-service/src/main/resources/application-all.yml
	message-service/src/main/resources/application-b2b.yml
	message-service/src/main/resources/application-demo.yml
	message-service/src/main/resources/application-dms.yml
	message-service/src/main/resources/application-learn.yml
	message-service/src/main/resources/application-scm.yml
	message-service/src/main/resources/application-test.yml
	message-service/src/main/resources/application-yxc.yml
	message-service/src/main/resources/application-yxcdev.yml
	order-service/src/main/java/com/ssy/lingxi/order/OrderServiceApplication.java
	order-service/src/main/java/com/ssy/lingxi/order/model/constant/OrderServiceContants.java
	order-service/src/main/java/com/ssy/lingxi/order/serviceimpl/base/BaseOrderProductServiceImpl.java
	order-service/src/main/java/com/ssy/lingxi/order/serviceimpl/base/BaseOrderServiceImpl.java
	order-service/src/main/java/com/ssy/lingxi/order/serviceimpl/web/BuyerOrderServiceImpl.java
	order-service/src/main/java/com/ssy/lingxi/order/serviceimpl/web/VendorOrderServiceImpl.java
	order-service/src/main/resources/application-learn.yml
	pay-service/src/main/resources/application-lxy_uat.yml
	pay-service/src/main/resources/application-wntest.yml
	product-service/src/main/java/com/ssy/lingxi/product/controller/CommodityController.java
	product-service/src/main/java/com/ssy/lingxi/product/serviceImpl/CommodityServiceImpl.java
	product-service/src/main/java/com/ssy/lingxi/product/serviceImpl/customer/CustomerCategoryServiceImpl.java
	report-service/src/main/java/com/ssy/lingxi/report/dao/order/ProcurementOrderDAO.java
	report-service/src/main/resources/application-learn.yml
	search-service/search-service-api/src/main/java/com/ssy/lingxi/search/api/model/request/PurchaseRequest.java
	search-service/src/main/java/com/ssy/lingxi/search/controller/pc/EnterpriseController.java
	search-service/src/main/java/com/ssy/lingxi/search/entity/Purchase.java
	search-service/src/main/java/com/ssy/lingxi/search/model/response/PurchaseResponse.java
	search-service/src/main/java/com/ssy/lingxi/search/serviceImpl/CommodityServiceImpl.java
	search-service/src/main/java/com/ssy/lingxi/search/serviceImpl/PurchaseServiceImpl.java
	system-service/src/main/resources/application-lxy_uat.yml
	transaction-service/src/main/resources/application-wntest.yml