Conflicts: application/admin/model/Goods.php application/api/controller/Clock.php application/api/controller/Shop.php