• AfirSraftGarrier's avatar
    Merge branch 'for-yx' · d9b4a048
    AfirSraftGarrier authored
    # Conflicts:
    #	license/pom.xml
    #	license/src/main/java/iot/sixiang/license/controller/SysOperLogController.java
    #	license/src/main/java/iot/sixiang/license/controller/UserController.java
    #	license/src/main/java/iot/sixiang/license/handler/GlobalExceptionHandler.java
    #	license/src/main/java/iot/sixiang/license/mapper/SysOperLogMapper.java
    #	license/src/main/java/iot/sixiang/license/net/TcpClient.java
    #	license/src/main/java/iot/sixiang/license/service/SysOperLogService.java
    #	license/src/main/java/iot/sixiang/license/service/UserService.java
    #	license/src/main/java/iot/sixiang/license/service/impl/SysOperLogServiceImpl.java
    #	license/src/main/java/iot/sixiang/license/service/impl/UserServiceImpl.java
    #	license/src/main/java/iot/sixiang/license/util/CommonUtil.java
    #	license/src/main/resources/mapper/PmsUseLogMapper.xml
    #	license/src/main/resources/mapper/SysOperLogMapper.xml
    d9b4a048
UserMapper.xml 2.05 KB