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

无关风月

昨天 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/HuiminCardStoreVO.java

@@ -10,6 +10,8 @@

    private String operatorName;

    private Integer operatorId;

    private String storeName;

    private String ids;