Merge remote-tracking branch 'origin/master'

zhangherong

昨天 b63d81722fa0fc56f3f6da7ccf8a294f15b8253a

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamWeekInsDetailUserResponse.java

@@ -28,7 +28,7 @@
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "点检日期")
    private Date inspectionDate;
    private Date planInspectionDate;

    /**点检人*/
    @ApiModelProperty(value = "点检人-是领取人")