Merge remote-tracking branch 'origin/dev_zyx' into dev_zyx

# Conflicts: # Application/Admin/Controller/FinanceController.class.php
5 years ago · 2c4e20911e
parent 882041495e bee4544f70
commit 2c4e20911e
1 changed files with 1 additions and 0 deletions
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@ -211,6 +211,7 @@ class FinanceController extends ThinkController
    public function nee()
    {
        echo 2;
        echo "1";
        # code...
    }