Merge remote-tracking branch 'origin/v11.0_add_tare_gross_weight_20240124' into test

performance-web/src/main/java/com/clx/performance/model/Dictionary.java

@@ -26,13 +26,13 @@ public class Dictionary implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @TableField("key")
+    @TableField("dictionary_name")
     @ApiModelProperty("")
-    private String key;
+    private String dictionaryName;
 
-    @TableField("value")
+    @TableField("dictionary_value")
     @ApiModelProperty("")
-    private String value;
+    private String dictionaryValue;
 
     @Override
     @KeyColumn("id")

performance-web/src/main/java/com/clx/performance/service/impl/DictionaryServiceImpl.java

@@ -19,7 +19,7 @@ public class DictionaryServiceImpl implements DictionaryService {
 
     @Override
     public String getOneByKey(String key) {
-        Dictionary dictionary = dictionaryDao.getOneByField(Dictionary::getKey, key).get();
-        return dictionary.getValue();
+        Dictionary dictionary = dictionaryDao.getOneByField(Dictionary::getDictionaryName, key).get();
+        return dictionary.getDictionaryValue();
     }
 }