物料定额

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java

@@ -4,6 +4,8 @@
 package org.springblade.desk.basic.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -83,26 +85,31 @@ public class MaterialQuota extends BaseEntity {
 	 * 镀层厚度
 	 */
 	@Schema(description = "镀层厚度")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private BigDecimal thickness;
 	/**
 	 * 定额
 	 */
 	@Schema(description = "定额")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private BigDecimal quota;
 	/**
 	 * 小批量定额
 	 */
 	@Schema(description = "小批量定额")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private BigDecimal smallBatQuota;
 	/**
 	 * 大批量定额
 	 */
 	@Schema(description = "大批量定额")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private BigDecimal bigBatQuota;
 
 	/**
 	 * 局部镀定额
 	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@Schema(description = "局部镀定额")
 	private BigDecimal localBatQuota;
 	/**

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java

@@ -113,6 +113,7 @@ public class LiquidTankController extends BladeController {
     public R<IPage<LiquidTankVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> liquidTank,
                                        Query query) {
         QueryWrapper<LiquidTank> qw = Condition.getQueryWrapper(liquidTank, LiquidTank.class);
+        qw.orderByDesc("CREATE_TIME");
         IPage<LiquidTank> pages = service.page(Condition.getPage(query), qw);
         IPage<LiquidTankVO> pagesVO = LiquidTankWrapper.build().pageVO(pages);