Merge remote-tracking branch 'origin/master'

Lius

7 天以前 7d2ae4c2fd8d45f0896b9accf84ff4177638fbcd

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java

@@ -111,7 +111,7 @@
     * 标准版本
     */
    @ApiModelProperty(value = "标准版本")
    private Integer standardVersion;
    private String standardVersion;
    /**
     * 编制人
     */