Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-31 6c0af7790f972e8a186a88d67e408498903d9eeb

 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;

}