Merge remote-tracking branch 'refs/remotes/ruoyi/master'

# Conflicts:
#	README.md
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/vue.config.js

ruoyi-ui/src/components/Crontab/hour.vue

@@ -51,10 +51,16 @@ export default {
 	methods: {
 		// 单选按钮值变化时
 		radioChange() {
+			if (this.cron.min === '*') {
+			    this.$emit('update', 'min', '0', 'hour');
+			}
+			if (this.cron.second === '*') {
+			    this.$emit('update', 'second', '0', 'hour');
+			}
 			switch (this.radioValue) {
 				case 1:
-        	this.$emit('update', 'hour', '*')
-        	break;
+					this.$emit('update', 'hour', '*')
+					break;
 				case 2:
 					this.$emit('update', 'hour', this.cycleTotal);
 					break;