Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

2 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java

@@ -439,6 +439,7 @@
                        tStoreOtherConfigTrue.setSort(tStoreOther.getSort());
                    }
                }
                tStoreOtherConfigTrue.setDisplayType(2);
            }
            return ResultUtil.success(tStoreOtherConfigTrues);
        } catch (Exception e) {