-
覃振观 authored# Conflicts: # topsun-xt/src/main/resources/application.properties # topsun-xt/src/main/webapp/biz/topsun/common/listeningFromData.js # topsun-xt/src/main/webapp/biz/topsun/product/productDetail.js # topsun/src/main/java/com/huigou/topsun/product/application/impl/ProductApplicationImpl.java # topsun/src/main/java/com/huigou/topsun/product/domain/Product.java # topsun/src/main/java/com/huigou/topsun/product/domain/ProductDetail.java # topsun/src/main/java/com/huigou/topsun/product/domain/ProductFaceColor.java # topsun/src/main/java/com/huigou/topsun/product/repository/ProductDetailRepository.java
dcf06759