liujh 3 anni fa
parent
commit
2ee02adf8b

+ 0 - 12
zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/BottleStorage.java

@@ -117,16 +117,4 @@ public class BottleStorage extends BaseBean {
     @ApiModelProperty("规格详情")
     private String specificationName;
 
-    @ApiModelProperty("出库人id")
-    private Long outUserId;
-
-    @ApiModelProperty("出库人姓名")
-    private Long outUserName;
-
-    @ApiModelProperty("出库时间")
-    private Long outTime;
-
-    @ApiModelProperty("出库人联系方式")
-    private Long outUserPhone;
-
 }

+ 1 - 5
zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/BottleStorageMapper.xml

@@ -29,17 +29,13 @@
         <result column="air_bottle_name" property="airBottleName" />
         <result column="air_component" property="airComponent" />
         <result column="specification_name" property="specificationName" />
-        <result column="out_user_id" property="outUserId" />
-        <result column="out_user_name" property="outUserName" />
-        <result column="out_user_phone" property="outUserPhone" />
-        <result column="out_time" property="outTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,
         create_time,
-        is_handwheel, is_fixed, is_electronic_tag, is_status_sign, is_photo, gas_pressure, validate_start_time, validate_end_time, electronic_tag, is_surplus, current_pressure, air_number, validate_remark, rejection_apply_img, rejection_apply_remark, rejection_apply_userid, rejection_apply_time, rejection_userid, rejection_time, task_detail_id, storage_status, task_id, storage_userid, air_bottle_id, air_bottle_name,air_component, specification_name, air_bottle_config_id
+        is_handwheel, is_fixed, is_electronic_tag, is_status_sign, is_photo, gas_pressure, validate_start_time, validate_end_time, electronic_tag, is_surplus, current_pressure, air_number, validate_remark, rejection_apply_img, rejection_apply_remark, rejection_apply_userid, rejection_apply_time, rejection_userid, rejection_time, task_detail_id, storage_status, task_id, storage_userid, air_bottle_id, air_bottle_name,air_component, specification_name
     </sql>
 
 </mapper>