44316 bom是否启动bomVersion merge 解决冲突

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java

@@ -40,8 +40,6 @@ public class MesBomService extends BaseMesService<MesBom> implements IMesBomServ
     @Autowired
     private IMesConfigService mesConfigService;
 
-    private final String MES_REPORT_FIND_BOM_WITH_EFFENDTIME = "MES_REPORT_FIND_BOM_WITH_EFFENDTIME";
-
     protected void setPackQueryBean(MesBom bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getBomVersion(), "bomVersion", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);