Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

tzsk

2024-04-25 60d14252f4951b1229e5699a0aa3c993f4ad173d

 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;