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

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCodeRuleServiceImpl.java

@@ -180,6 +180,9 @@ public class SysCodeRuleServiceImpl implements ISysCodeRuleService {
                 sysCodeRule.setNextCode(nCode);
                 return sysCodeRule;
             }
+        } else if (sysCodeRule.getRenewFlag().equals(SysConstants.SYS_RENEW_FLAG_NO) && ruleTemplate != null) {
+            dateToStr = DateUtils.parseDateToStr(ruleTemplate, new Date());
+            code.append(dateToStr);
         }
         long seq = 1L;
         if ((StringUtils.isNotEmpty(nextCode) && StringUtils.isNotEmpty(dateToStr) && nextCode.contains(dateToStr))