• 覃振观's avatar
    Merge branch 'dev' into QZG · dcf06759
    覃振观 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
Name
Last commit
Last update
..
product.js Loading commit data...
product.jsp Loading commit data...
productDetail.js Loading commit data...
productDetail.jsp Loading commit data...
productDetail2.js Loading commit data...
productDetail2.jsp Loading commit data...
sizeGroup.js Loading commit data...
sizeGroup.jsp Loading commit data...
sizeGroupDetail.js Loading commit data...
sizeGroupDetail.jsp Loading commit data...