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

zyx

2024-01-02 66c78586d3f2d9f854994bf7e7a9d5aed27d9c2f

 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;