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

Junjie

2023-09-26 192834a2160e2aa0f8a4bad9b13bdd535df57e9c

 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;