Conflicts:
	.idea/misc.xml
	merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberCommentServiceImpl.java
	order-service/src/main/java/com/ssy/lingxi/order/service/base/IBaseOrderService.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/VendorOrderServiceImpl.java
	product-service/src/main/java/com/ssy/lingxi/product/controller/CommodityFeignController.java