Merge remote-tracking branch 'origin/dev_wkx_20251209' into dev

This commit is contained in:
王奎兴
2025-12-13 22:06:34 +08:00
16 changed files with 135 additions and 1 deletions
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@@ -35,4 +36,8 @@ public class MaterialDO {
private Boolean deleted;
private BigDecimal materialVolume;
private String materialContent;
/**组织相关*/
private String topOrganizationId;
/**组织相关*/
private String organizationId;
}