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

peng

6 天以前 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85

 framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java

@@ -9,6 +9,7 @@
public enum GoodsSalesModeEnum {

    RETAIL("零售"),
    PRESALE("预售"),
    WHOLESALE("批发");

    private final String description;