Merge remote-tracking branch 'origin/master'

zhangherong

4 天以前 b63d81722fa0fc56f3f6da7ccf8a294f15b8253a

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

@@ -79,13 +79,13 @@
     */
    @ApiModelProperty(value = "设备功能是否齐备;是否")
    @Dict(dicCode = "yn")
    private String fullyFunctionalResult;
    private String fullyFunctional;
    /**
     * 设备功能是否齐备;是否
     */
    @ApiModelProperty(value = "设备功能是否正常运转;是否")
    @Dict(dicCode = "yn")
    private String runningNormallyResult;
    private String runningNormally;
    /**
     * 问题描述
     */