Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-08-22 deee597fa30e9a40792a4eb094b6ce45a35bc13f

 igds-core/src/main/java/com/ld/igds/models/DepotConf.java

@@ -43,6 +43,10 @@
    @PropertyDef(label = "能耗分机")
    private String esSer;

    @Column(name = "GAS_SER_", length = 40)
    @PropertyDef(label = "气体分机")
    private String gasSer;

    @Column(name = "GRAIN_FREQ_", length = 4)
    @PropertyDef(label = "粮情保存频率", description = "默认一天多次")
    private String grainFreq = GrainFrequence.FREQ_01.getCode();