|
|
b5f945faa5
|
Merge branch 'guoshengxiong' into guoshengxiongtemp
|
2024-07-03 10:11:14 +08:00 |
|
|
|
77f915e849
|
雨量bug修改
|
2024-07-03 10:10:52 +08:00 |
|
|
|
020206a10f
|
bug修改
|
2024-07-02 18:59:47 +08:00 |
|
|
|
f49f586297
|
Merge branch 'guoshengxiong' into guoshengxiongtemp
|
2024-07-02 17:08:09 +08:00 |
|
|
|
d929e896c4
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-07-02 17:04:08 +08:00 |
|
|
|
d09fb2ff7d
|
bug修改
|
2024-07-02 17:03:28 +08:00 |
|
|
|
5d80626d9b
|
工作流日志
|
2024-07-02 16:20:29 +08:00 |
|
|
|
7102984088
|
正式环境bug修改
|
2024-07-02 14:33:02 +08:00 |
|
|
|
16c9a9e4c7
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-07-02 14:19:52 +08:00 |
|
|
|
a83c2103b3
|
正式环境bug修改
|
2024-07-02 14:19:35 +08:00 |
|
|
|
8536616ae0
|
工作流日志
|
2024-07-02 11:32:53 +08:00 |
|
|
|
83353faa56
|
进度bug修改
|
2024-07-02 11:26:14 +08:00 |
|
|
|
ef02864567
|
进度审批修改监理
|
2024-07-02 11:18:28 +08:00 |
|
|
|
ab2b00e645
|
大屏算总分
|
2024-07-01 20:14:23 +08:00 |
|
|
|
6440b9d422
|
bug修复和代码规范
|
2024-07-01 17:38:31 +08:00 |
|
|
|
9764cb50e7
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteService.java
# src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteTaskService.java
# src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteToPointService.java
# src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDataService.java
# src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDevService.java
# src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationMaterialDataService.java
# src/main/java/com/zhgd/xmgl/modules/environment/service/IRainAlarmService.java
# src/main/java/com/zhgd/xmgl/modules/environment/service/IRainDevService.java
# src/main/java/com/zhgd/xmgl/modules/environment/service/IRainRecordService.java
# src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDataService.java
# src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDevService.java
# src/main/java/com/zhgd/xmgl/modules/goulipkpm/service/IGouliPkpmConfigService.java
# src/main/java/com/zhgd/xmgl/modules/goulipkpm/service/IGouliPkpmModelService.java
# src/main/java/com/zhgd/xmgl/modules/goulipkpm/service/ITaskProgressRtService.java
# src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketAlarmDataService.java
# src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectDataService.java
# src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectKdeDataService.java
# src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDevService.java
# src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDisplacementDataService.java
# src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionAlarmService.java
# src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionDayRecordService.java
# src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionDevService.java
# src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionFenceService.java
# src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionDevService.java
# src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionRecordService.java
# src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveDevService.java
# src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveRecordService.java
# src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationDataService.java
# src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationDevService.java
# src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationExceedDataService.java
# src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationMaterialDataService.java
# src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationProdDataService.java
# src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineDevService.java
# src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageBlockDataService.java
# src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageBlockNumberService.java
# src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtConstructionDrawService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtDesignChangeContactSheetService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtMaterialOrderService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtNewTechnologiesAndNewProcessService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtProgressPaymentContractService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtRiskInventoryTypeService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolHistoryService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtWorkTicketService.java
# src/main/java/com/zhgd/xmgl/modules/rt/service/IRtWorkTicketToRiskSecurityLibraryTypeService.java
# src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatAlarmService.java
# src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java
# src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDevService.java
# src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatFenceService.java
# src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageAlarmService.java
# src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java
# src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDevService.java
# src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageWarnThresholdService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBeamService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBeamToProcessService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBridgeSectionService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldMaintainDataService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldMakeBeamPedestalService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldProcessService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldProductionLineService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldSaveBeamDistrictService.java
# src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldSaveBeamPedestalService.java
# src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutDataService.java
# src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutDevService.java
# src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutSteelBeamDataService.java
# src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionDataService.java
# src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionDevService.java
# src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionSteelBeamDataService.java
# src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevService.java
# src/main/java/com/zhgd/xmgl/modules/sprayrt/service/ISprayRtDataService.java
# src/main/java/com/zhgd/xmgl/modules/sprayrt/service/ISprayRtDevService.java
# src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDataService.java
# src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDevService.java
# src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationRawMaterialDataService.java
# src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationSetDataService.java
# src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressContentService.java
# src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressMaterialTypeService.java
# src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestDevService.java
# src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageBlockDataService.java
# src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageBlockNumberService.java
# src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageService.java
# src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionAlarmService.java
# src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDataService.java
# src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDayRecordService.java
# src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDevService.java
# src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionFenceService.java
# src/main/java/com/zhgd/xmgl/modules/video/service/IProjectVideoHkVqdService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/ISecurityWorkerCourseInfoService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IUfaceDevGroupService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IUfaceDevToGroupService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IVrSecurityWorkerLoginInfoService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoDeleteService.java
# src/main/java/com/zhgd/xmgl/modules/xz.security/service/IWorkerAccessRecordService.java
# src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzMilestoneService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IEducationConfigWeekVideoService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzAiDeductRuleService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzCertificateExpireAlarmRecordService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionVideoFullService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionVideoOnlineService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzNoticeService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzProjectOrgService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzRegistryService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationApplyService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationRecordService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierRecordService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressContentService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzBlindPlatePlugSafeService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzGasAnalyzeService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzGroundSafetService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzHighJobSafeService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzHoistSafetyWorkService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzLimitSpaceSafeService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzOpenCircuitSafeService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzSpecialOperationFireSafetyService.java
# src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzTemporaryElectricitySafeService.java
|
2024-07-01 16:16:30 +08:00 |
|
|
|
d814d56a00
|
代码规范
|
2024-07-01 14:18:33 +08:00 |
|
|
|
968ab5da60
|
代码规范
|
2024-07-01 14:17:43 +08:00 |
|
|
|
62e3e5b5e1
|
代码规范
|
2024-07-01 14:15:37 +08:00 |
|
|
|
ed46097103
|
教育记录bug修复
|
2024-07-01 11:45:55 +08:00 |
|
|
|
160d52d662
|
代码规范
|
2024-07-01 11:29:08 +08:00 |
|
|
|
7223e7c05a
|
代码规范
|
2024-07-01 11:22:28 +08:00 |
|
|
|
2f855d3d1e
|
代码规范
|
2024-07-01 09:51:07 +08:00 |
|
|
|
b8a3fd258a
|
甘特图bug修复
|
2024-07-01 09:08:35 +08:00 |
|
|
|
e099a6d971
|
安全教育bug修复
|
2024-07-01 09:07:44 +08:00 |
|
|
|
a37f302fd1
|
bug修复
|
2024-06-29 18:24:21 +08:00 |
|
|
|
2a34ba4ebe
|
bug优化
|
2024-06-29 16:49:17 +08:00 |
|
|
|
0d61795a3c
|
雨量大屏接口
|
2024-06-29 16:14:13 +08:00 |
|
|
|
3587197e44
|
雨量大屏接口
|
2024-06-29 16:13:03 +08:00 |
|
|
|
4aad451bed
|
bug修改
|
2024-06-29 11:53:14 +08:00 |
|
|
|
55992c0937
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-06-29 10:21:05 +08:00 |
|
|
|
00b00aea64
|
bug修改
|
2024-06-29 10:18:47 +08:00 |
|
|
|
46a72bf3ae
|
工作流日志
|
2024-06-29 10:00:31 +08:00 |
|
|
|
17753dfa8c
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-06-28 21:43:31 +08:00 |
|
|
|
6a166cce8f
|
bug修复
|
2024-06-28 21:43:25 +08:00 |
|
|
|
b70e769018
|
bug修改
|
2024-06-28 20:54:54 +08:00 |
|
|
|
af7fb6c80a
|
bug修复
|
2024-06-28 20:51:36 +08:00 |
|
|
|
f35059b460
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-06-28 17:54:04 +08:00 |
|
|
|
8f20420f9e
|
ai修改
|
2024-06-28 17:53:47 +08:00 |
|
|
|
eaedd9df33
|
土石方运输
|
2024-06-28 17:30:11 +08:00 |
|
|
|
5272425cad
|
添加操作注解
|
2024-06-28 16:26:52 +08:00 |
|
|
|
abcd3f871e
|
bug修改
|
2024-06-28 16:21:44 +08:00 |
|
|
|
8c5b380cf0
|
加操作注解
|
2024-06-28 15:05:19 +08:00 |
|
|
|
4fa5a5d718
|
加操作注解
|
2024-06-28 14:49:24 +08:00 |
|
|
|
41f5421da6
|
加操作注解
|
2024-06-28 14:46:48 +08:00 |
|
|
|
67d06b1cfd
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-06-28 14:31:55 +08:00 |
|
|
|
dd8e5c424f
|
bug修改和加操作注解
|
2024-06-28 14:31:33 +08:00 |
|
|
|
81b3311f46
|
BUG修复
|
2024-06-28 10:23:44 +08:00 |
|
|
|
7bfd5448fa
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2024-06-27 20:00:35 +08:00 |
|
|
|
0873171a45
|
bug修改
|
2024-06-27 20:00:17 +08:00 |
|
