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

jinpengyong

2021-06-24 06b00a178d194d33370e44410c4f04a4164f86c7

 screen-common/src/main/java/com/moral/util/KaptchaUtils.java

@@ -37,7 +37,7 @@
    private static RedisTemplate redisTemplate;

    //验证码有效期 单位：秒
    private static final int validity_time = 60;
    private static final int validity_time = 60*60;

    @Autowired
    public void setRedisTemplate(RedisTemplate redisTemplate) {