Merge remote-tracking branch 'origin/master'

lyh

2 天以前 bc8cd378fd72f43e66120c540f57f630580aa093

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquEffVo.java

@@ -23,6 +23,14 @@
     */
    private String teamCodes;
    /**
     * 设备类型
     */
    private String equipmentType;
    /**
     * 班制id
     */
    private String shiftId;
    /**
     * 月份
     */
    private String month;