Merge remote-tracking branch 'origin/master'

liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java

@@ -182,9 +182,9 @@ public class ComLocalconfigServiceImpl implements ComLocalconfigService {
             String yq=zdlb.trim().substring(5);
             return getitem(yq);
         }else if ("barcode".equals(zdlb)) {
-            return getreportdict("2");
+            return getreportdict("1");
         } else if ("reback".equals(zdlb)) {
-            return getreportdict("3");
+            return getreportdict("2");
         }
         return commonUtil.getComDictList(zdlb);
     }