Merge remote-tracking branch 'origin/huacheng_test' into huacheng_zts

张天森

2022-07-11 8ef6cc463ec3e1c7f7164bcfe19c383214cb5db4

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java

@@ -34,7 +34,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endTime;
    @ApiModelProperty("系统用户姓名")
    private Date systemName;
    private String systemName;
    @ApiModelProperty("用户Id")
    private Long userId;
    @ApiModelProperty("参数id")