Merge remote-tracking branch 'origin/master'

rain

2026-01-09 d2edb2eab776a8bc63301280fd637a868089e194

Merge remote-tracking branch 'origin/master'

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml

@@ -18,6 +18,7 @@
        <result column="manufacturer" property="manufacturer"/>
        <result column="source" property="source"/>
        <result column="purpose" property="purpose"/>
        <result column="charger" property="charger"/>
    </resultMap>

    <select id="getFwDeviceMaintainPlanById" resultMap="fwDeviceMaintainPlanResultMap">
@@ -31,6 +32,7 @@
        b.manufacturer,
        b.source,
        b.purpose,
        b.charger,
        a.*
        from
        ja_fw_device_maintain_plan a
@@ -55,6 +57,7 @@
            b.manufacturer,
            b.source,
            b.purpose,
            b.charger,
            a.*
        from
            ja_fw_device_maintain_plan a

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml

@@ -18,6 +18,7 @@
        <result column="manufacturer" property="manufacturer"/>
        <result column="source" property="source"/>
        <result column="purpose" property="purpose"/>
        <result column="charger" property="charger"/>
    </resultMap>

    <select id="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
@@ -31,6 +32,7 @@
        b.manufacturer,
        b.source,
        b.purpose,
        b.charger,
        a.*
        from
        ja_fw_device_scrap a
@@ -55,6 +57,7 @@
        b.manufacturer,
        b.source,
        b.purpose,
        b.charger,
        a.*
        from
        ja_fw_device_scrap a

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java

@@ -107,5 +107,11 @@
    @ApiModelProperty(value = "用途")
    private String purpose;

    /**
     * 负责人
     */
    @ApiModelProperty(value = "负责人")
    private String charger;


}

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceScrapVO.java

@@ -115,4 +115,10 @@
    @ApiModelProperty(value = "用途")
    private String purpose;

    /**
     * 负责人
     */
    @ApiModelProperty(value = "负责人")
    private String charger;

}