Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheck/dto/CmmsSpotcheckAddDTO.java

@@ -59,6 +59,9 @@ public class CmmsSpotcheckAddDTO implements Serializable {
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
 
     /** 设备点检-点检项信息 */
     private List<CmmsSpotcheckTitem> cmmsSpotcheckTitemList;

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheck/vo/CmmsSpotcheckQueryVO.java

@@ -63,6 +63,9 @@ public class CmmsSpotcheckQueryVO  implements Serializable {
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
 
     /** 设备点检-点检项信息 */
     private List<CmmsSpotcheckTitem> cmmsSpotcheckTitemList;