通过
1 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at 5cd6cfc 合并分支 'wangxiaogang' 到 'master'
From http://114.215.101.231:8099/anyv/xkeasy
5cd6cfc..b6944cb master -> origin/master
Checking out b6944cb2 as master...
Skipping Git submodules setup
$ cd /alidata/www/w/xkeasy
$ git pull
From http://114.215.101.231:8099/anyv/xkeasy
5cd6cfc..b6944cb master -> origin/master
Updating 5cd6cfc..b6944cb
Fast-forward
app/admin/controller/SalesmanController.php | 27 +++++++++++++++++++---
app/admin/controller/UsersController.php | 18 +++++++++++++++
.../admin/salesman/salesman_list.html | 4 +++-
.../admin/salesman/salesman_money.html | 27 ++++++++++++++++++++++
.../admin/salesman/student_list.html | 2 --
.../admin/salesman/teacher_list.html | 2 +-
.../admin/salesmanorder/sale_order_list.html | 3 +++
.../admin/users/student_list.html | 2 --
.../admin/users/teacher_list.html | 2 +-
.../admin_simpleboot3/admin/users/user_list.html | 8 +++++--
.../admin_simpleboot3/admin/users/users_money.html | 27 ++++++++++++++++++++++
.../simpleboot3/portal/shopcart/shop_cart.html | 19 +++++++++++----
12 files changed, 124 insertions(+), 17 deletions(-)
create mode 100644 public/themes/admin_simpleboot3/admin/salesman/salesman_money.html
create mode 100644 public/themes/admin_simpleboot3/admin/users/users_money.html
Build succeeded