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

luxiaotao1123

2020-06-27 4e60273930b31cc25f7c2a4ab1b7d5a8088a378b

 src/main/java/com/zy/asrs/entity/ViewLocMapDto.java

@@ -70,7 +70,7 @@
                break;
            case "R":
                this.bgc = "#D7FFF0";
                this.color = "#fff";
                this.color = "#000";
                break;
            case "S":
                this.bgc = "#F0DAD2";