Merge branch 'test' into 'master'

罗元桥

2021-08-02 7671fa0c16cc3d4daa9795d68c057bb7a4de2b5f

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaPageDTO.java

@@ -44,6 +44,6 @@
     * 联系电话
     */
    @ApiModelProperty("联系电话")
    private Integer phone;
    private String phone;

}