Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-09-29 b7cce455b55ccffb60e53b101c82bbf478415fcf

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -13,6 +13,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.repository.query.Param;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

@@ -249,4 +250,6 @@





}