Merge remote-tracking branch 'origin/master'

2 years ago · f19ce0a110
parent 15f3f8cba1 b976e89446
commit f19ce0a110
1 changed files with 2 additions and 0 deletions
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScadaFoamDeviceinfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScadaFoamDeviceinfoServiceImpl.java
@ -33,6 +33,8 @@ public class ScadaFoamDeviceinfoServiceImpl implements IScadaFoamDeviceinfoServi
    @Autowired
    private ScadaFoamHourDataMapper scadaFoamHourDataMapper;

+    @Value("${in_id}")
+    private int in_id;
    /**
     * 查询发泡设备
     *