1.修改叉车字段

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicForkliftEntity.java

@@ -169,7 +169,7 @@ public class BasicForkliftEntity extends TenantEntity {
 	 * 所属仓库
 	 */
 	@ApiModelProperty(value = "所属仓库")
-	private String owningWarehouse;
+	private String  warehouseId;
 	/**
 	 * 预留1
 	 */

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPropertyController.java

@@ -25,6 +25,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import lombok.extern.log4j.Log4j2;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
@@ -58,7 +59,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/property")
 @Api(value = "资产", tags = "资产接口")
-@Slf4j
+@Log4j2
 public class BasicPropertyController extends BladeController {
 
 	private final IBasicPropertyService basicPropertyService;
@@ -148,7 +149,6 @@ public class BasicPropertyController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		log.info("进来了》》》》》》》》》》》");
 			//删除所有子表
 			 basicPropertyfieldService.deleteByMasterId(Func.toLongList(ids));
 		return R.status(basicPropertyService.deleteLogic(Func.toLongList(ids)));

blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicForkliftExcel.java

@@ -209,7 +209,7 @@ public class BasicForkliftExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("所属仓库")
-	private String owningWarehouse;
+	private String warehouseId;
 	/**
 	 * 预留1
 	 */

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicForkliftMapper.xml

@@ -38,7 +38,7 @@
         <result column="payment_method" property="paymentMethod"/>
         <result column="notes" property="notes"/>
         <result column="forklift_photo" property="forkliftPhoto"/>
-        <result column="owning_warehouse" property="owningWarehouse"/>
+        <result column="warehouse_id" property="warehouseId"/>
         <result column="reserve1" property="reserve1"/>
         <result column="reserve2" property="reserve2"/>
         <result column="reserve3" property="reserve3"/>