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

18516761980

2022-08-13 2e586ec3808b5a6d170aba9ddcbf5ef7b69f9eef

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

@@ -47,6 +47,7 @@
     * 用户码
     */
    @ApiModelProperty(value= "用户码")
    @TableField("user_id")
    private String userId;

    /**