Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

luxiaotao1123

2021-08-26 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e

 src/main/java/com/zy/system/entity/OperateLog.java

@@ -35,7 +35,7 @@
    private Long userId;

    /**
     * 客户端IP
     * 库位名称端IP
     */
    private String ip;