Merge branch 'sxjzasrs' of http://47.97.1.152:5880/r/zy-asrs into sxjzasrs0

luxiaotao1123

2022-01-24 1918c5fe8c390ca90acff60b71e27257d65fb463

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

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

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