物料转换sql修改

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesConverMapper.xml

@@ -63,7 +63,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.ruoyi.system.domain.ActOperation" id="ActOperationResult">
         <result property="id"    column="id"    />
-        <result property="encoding" column="encoding"/>
         <result property="suppliesName"    column="supplies_name"    />
         <result property="detaliesName"    column="details_name"    />
     </resultMap>
@@ -90,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="converSupplies" parameterType="java.util.List" resultMap="ActOperationResult">
 
-        select id , encoding, supplies_name, b.details_name from act_supplies a ,(
+        select id , supplies_name, b.details_name from act_supplies a ,(
         SELECT sid ,details_name
         FROM act_supplies_details
         WHERE details_name IN