Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs

zyx

2023-10-12 d0e38da5f46c79a5fb675c36ae18c4fc3cebdf74

 src/main/java/com/zy/common/service/erp/ErpSqlServer.java

@@ -67,6 +67,9 @@
    /*********************************   核心层   *********************************/
    /*****************************************************************************/

    /**
     * map 转 对象
     */

    private List<Map<String, Object>> executeQuery(String sql) {
        Connection conn = null;