Merge remote-tracking branch 'origin/master'

zhoushihao

2025-10-27 636bd027a92d4bf669410ee550a5ca6324f72c88

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java

@@ -1,6 +1,5 @@
package com.mes.pp.entity;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -50,7 +49,7 @@
    /**
     * 玻璃厚度
     */
    private String glassThickness;
    private Integer  glassThickness;

    /**
     * 工程种类