Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationRespVO.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.business.config.controller.vo;
 
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -17,6 +18,7 @@ public class ConfigWarehouseLocationRespVO {
     @ExcelProperty("ID")
     private Long id;
 
+//    @Dict(dictTable="t_cfg_wrh_loc",dicCode="id",dicText="name")
     @Schema(description = "父ID", example = "31498")
     @ExcelProperty("父ID")
     private Long parentId;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/aspect/DictAspect.java

@@ -137,7 +137,7 @@ public class DictAspect {
                 String dictCode = code;
                 if (!StringUtils.isEmpty(table)) {
                     //指定table
-                    dictCode = String.format("%s,%s,%s,%s", table, text, code, keyOrId);
+                    dictCode = String.format("%s,%s,%s", table, text, code);
                 }else{
                     dictCode = String.format("%s"+DICT_ANNOTATION_SPLIT+"%s", code, keyOrId);
                 }