Merge branch 'dev_wf' of wugg/phpstock into version1.5

LICENSE.txt

@@ -25,12 +25,11 @@ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+LOSS OF USE, DATA, OR PROFIT OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-GY202104290049
+POSSIBILITY OF SUCH D
 GY202105080818
 GY202105080581
 GY202105070540

app/admin/controller/Purchin.php

@@ -259,7 +259,7 @@ class Purchin extends BaseController
             return error_show(1004,"新建失败");
         }catch (\Exception $e){
             Db::rollback();
-            return error_show(1004,$e->getMessage());
+            return error_show(1004, $e->getMessage() . '|' . $e->getFile() . '|' . $e->getLine());
         }
     }