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

chenlu

2 天以前 2e1553e8a7120c2d38d69a8f400dcca2557b09fb

 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

@@ -39,4 +40,8 @@
    Boolean updateProcessMp(Integer id, String process);

    List<User> findByAddress(String userName);

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

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