增加料架分组界面的组列表接口

src/main/java/com/neotel/smfcore/security/rest/GroupController.java

@@ -92,7 +92,7 @@ public class GroupController {
         for (Group g :
         for (Group g :
                 groups) {
                 groups) {
             if (dataCache.getCidsByGroupId(g.getId(), true).size() > 0) {
             if (dataCache.getCidsByGroupId(g.getId(), true).size() > 0) {
-                resultGroups.add(group);
+                resultGroups.add(g);
             }
             }
         }
         }
         return new ResponseEntity<>(groupMapper.toDto(resultGroups), HttpStatus.OK);
         return new ResponseEntity<>(groupMapper.toDto(resultGroups), HttpStatus.OK);

src/main/resources/messages.properties

@@ -83,6 +83,7 @@ smfcode.error.barcode.exist=[{0}}]\u5DF2\u5728{1}}[{2}}]\u4E2D
 smfcore.barcodeSetting=\u6761\u7801\u8BBE\u7F6E
 smfcore.barcodeSetting=\u6761\u7801\u8BBE\u7F6E
 smfcore.posNotExist=\u4ED3\u4F4D\u4E0D\u5B58\u5728
 smfcore.posNotExist=\u4ED3\u4F4D\u4E0D\u5B58\u5728
 smfcore.error=\u51FA\u9519{0}
 smfcore.error=\u51FA\u9519{0}
+smfcore.userManager=\u7528\u6237\u7BA1\u7406
 
 
 
 
 
 

src/main/resources/messages_en_US.properties

@@ -82,4 +82,5 @@ smfcode.noValidStorage=No available bin found in bin list
 smfcode.error.barcode.exist=[{0}}] is already in {1}}[{2}}]
 smfcode.error.barcode.exist=[{0}}] is already in {1}}[{2}}]
 smfcore.barcodeSetting=Barcode setting
 smfcore.barcodeSetting=Barcode setting
 smfcore.posNotExist=Positions do not exist
 smfcore.posNotExist=Positions do not exist
-smfcore.error=Error{0}
\ No newline at end of file
+smfcore.error=Error{0}
+smfcore.userManager=User Management
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -82,4 +82,5 @@ smfcode.noValidStorage=\u30D3\u30F3\u30EA\u30B9\u30C8\u306B\u5229\u7528\u53EF\u8
 smfcode.error.barcode.exist=[0}}]\u306F\u3059\u3067\u306B{1}[{2}}\u306B\u5165\u3063\u3066\u3044\u307E\u3059\u3002
 smfcode.error.barcode.exist=[0}}]\u306F\u3059\u3067\u306B{1}[{2}}\u306B\u5165\u3063\u3066\u3044\u307E\u3059\u3002
 smfcore.barcodeSetting=\u30D0\u30FC\u30B3\u30FC\u30C9\u8A2D\u5B9A
 smfcore.barcodeSetting=\u30D0\u30FC\u30B3\u30FC\u30C9\u8A2D\u5B9A
 smfcore.posNotExist=\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30B9\u30DA\u30FC\u30B9\u304C\u5B58\u5728\u3057\u306A\u3044
 smfcore.posNotExist=\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30B9\u30DA\u30FC\u30B9\u304C\u5B58\u5728\u3057\u306A\u3044
-smfcore.error=\u8AA4\u308A{0}
\ No newline at end of file
+smfcore.error=\u8AA4\u308A{0}
+smfcore.userManager=\u30E6\u30FC\u30B6\u30FC\u7BA1\u7406
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -83,4 +83,5 @@ smfcode.error.barcode.exist=[{0}}]\u5DF2\u5728{1}}[{2}}]\u4E2D
 smfcore.barcodeSetting=\u6761\u7801\u8BBE\u7F6E
 smfcore.barcodeSetting=\u6761\u7801\u8BBE\u7F6E
 smfcore.posNotExist=\u4ED3\u4F4D\u4E0D\u5B58\u5728
 smfcore.posNotExist=\u4ED3\u4F4D\u4E0D\u5B58\u5728
 smfcore.error=\u51FA\u9519{0}
 smfcore.error=\u51FA\u9519{0}
+smfcore.userManager=\u7528\u6237\u7BA1\u7406
 
 

src/main/resources/messages_zh_TW.properties

@@ -82,4 +82,5 @@ smfcode.noValidStorage=\u6599\u5009\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7
 smfcode.error.barcode.exist=[{0}}]\u5DF2\u5728{1}}[{2}}]\u4E2D
 smfcode.error.barcode.exist=[{0}}]\u5DF2\u5728{1}}[{2}}]\u4E2D
 smfcore.barcodeSetting=\u689D\u78BC\u8A2D\u7F6E
 smfcore.barcodeSetting=\u689D\u78BC\u8A2D\u7F6E
 smfcore.posNotExist=\u5EAB\u4F4D\u4E0D\u5B58\u5728
 smfcore.posNotExist=\u5EAB\u4F4D\u4E0D\u5B58\u5728
-smfcore.error=\u51FA\u932F{0}
\ No newline at end of file
+smfcore.error=\u51FA\u932F{0}
+smfcore.userManager=\u7528\u6236\u7BA1\u7406
\ No newline at end of file