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

luxiaotao1123

2020-09-15 5fe9c379f0cc696568a0db249026a1e8a3b02a5a

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

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

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