Merge branch 'master' of http://119.23.72.7/shiyu/icsales
# Conflicts: # Application/Home/View/public/header.html
Showing
with
649 additions
and
103 deletions
Application/Common/Common/function.php
0 → 100644
This diff is collapsed.
Click to expand it.
Application/Common/Conf/config_db.php
0 → 100644
Application/Home/Model/ScmsModel.class.php
0 → 100644
This diff is collapsed.
Click to expand it.
Common/Conf/config.php
deleted
100644 → 0
Common/Conf/index.html
deleted
100644 → 0
Common/index.html
deleted
100644 → 0
Home/Common/index.html
deleted
100644 → 0
Home/Conf/config.php
deleted
100644 → 0
Home/Conf/index.html
deleted
100644 → 0
Home/Controller/index.html
deleted
100644 → 0
Home/Model/index.html
deleted
100644 → 0
Home/View/index.html
deleted
100644 → 0
Home/index.html
deleted
100644 → 0
dist/css/goodmanage.css.map
0 → 100644
dist/js/global/api.js
0 → 100644
dist/js/goodmanage/index.js
0 → 100644
dist/js/goodmanage/uploadsingle.js
0 → 100644
Please
register
or
sign in
to comment