Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-12-10 1750abd11320f8d09ffe1580b7467dba87c86c89

 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java

@@ -8,6 +8,7 @@
import org.apache.ibatis.annotations.Select;

import java.util.List;
import java.util.Map;

@Mapper

@@ -41,4 +42,6 @@
    List<User> findByAddress(String userName);

    String selectOptimizeParmsById(@Param("username") String username);

    List<Map<String, Object>> getUserLog();
}