ufo / ufo-platform · Commits

Go to a project
  • Merge branch 'test6.9.23' of http://git.yoho.cn/ufo/ufo-platform into test6.9.23 ...
    3b1f462c 
    # Conflicts:
#	web/src/main/webapp/html/fore/apply-refund.html
#	web/src/main/webapp/html/fore/coupon.html
#	web/src/main/webapp/html/fore/price-compare.html
#	web/src/main/webapp/html/fore/product.html
#	web/src/main/webapp/html/fore/refund-order.html
#	web/src/main/webapp/html/fore/resource-edit-new.html
#	web/src/main/webapp/html/fore/resource-edit.html
#	web/src/main/webapp/html/fore/resource-list.html
#	web/src/main/webapp/html/fore/send-coupon.html
#	web/src/main/webapp/html/fore/send-record.html
#	web/src/main/webapp/html/fore/service-fee-setting.html
#	web/src/main/webapp/html/fore/shop.html
    by Lixiaodi
     
    Browse Files
  • 批量代码提交
    ae704e01
    by Lixiaodi
     
    Browse Files