Merge remote-tracking branch 'origin/master'

lyh

昨天 bc8cd378fd72f43e66120c540f57f630580aa093

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamEquipmentQuery.java

@@ -13,6 +13,14 @@
    private String operationSystem;
    private String orgId;
    private String equipmentCategory;
    private String manufacturingEnterprise;
    private String originalValue;
    private String performanceIndicators;
    private String leaveFactoryStartTime;
    private String leaveFactoryEndTime;
    private String acceptanceCheckStartTime;
    private String acceptanceCheckEndTime;
    private String equipmentUse;

    private String column;
    private String order;