# Conflicts:
#	liquidnet-bus-config/liquidnet-config/application-test.yml
#	liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/PlatformTaskHandler.java
#	liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/ObjectUtil.java
#	liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/resources/sqlmap.properties

~API:商品管理:添加、编辑图片、标签、服务支持同步Mysql调整;

~API:优惠券编辑:关联商品为空处理;

~API:优惠券详情:SPU分类名称展示处理;