Merge branch 'refs/heads/master' into herb

baoshiwei

2024-12-11 7c585586e9bea943161676bd9d127e81123891c3

 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/common/CacheConstants.java

old mode 100644
new mode 100755
@@ -12,7 +12,9 @@
        WORK_ORDER("workOrder","工单MAP"),


        EQP_MAP("eqpMap", "设备MAP,key:tenantId+equipmentId");
        EQP_MAP("eqpMap", "设备MAP,key:tenantId+equipmentId"),

        NEAR_TEN("nearTen", "最近十次效率和消耗平均,key:tenantId+orderCode+equipmentId");

        private String code;
        private String text;