前端表单样式修改成圆角

ruoyi-admin/src/main/resources/static/css/login.css

@@ -144,4 +144,18 @@ body.signin {
     font-weight: normal; /*改变了rememberme的字体*/
     margin-bottom: 0;
     text-align: left;
+}
+
+.form-control, .form-control:focus, .has-error .form-control:focus,  .has-success .form-control:focus, .has-warning .form-control:focus,  .navbar-collapse, .navbar-form, .navbar-form-custom .form-control:focus,  .navbar-form-custom .form-control:hover, .open .btn.dropdown-toggle,  .panel, .popover, .progress, .progress-bar {
+    box-shadow: none;
+}
+
+.form-control{
+	border-radius: 1px!important;
+	padding: 6px 12px!important;
+	height: 34px!important;
+}
+
+.form-control:focus{
+    border-color: #1ab394 !important;
 }

ruoyi-admin/src/main/resources/static/css/style.css

@@ -865,9 +865,9 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
     color: #cacaca;
 }
 
-.form-control, .form-control:focus, .has-error .form-control:focus,  .has-success .form-control:focus, .has-warning .form-control:focus,  .navbar-collapse, .navbar-form, .navbar-form-custom .form-control:focus,  .navbar-form-custom .form-control:hover, .open .btn.dropdown-toggle,  .panel, .popover, .progress, .progress-bar {
-    box-shadow: none;
-}
+/* .form-control, .form-control:focus, .has-error .form-control:focus,  .has-success .form-control:focus, .has-warning .form-control:focus,  .navbar-collapse, .navbar-form, .navbar-form-custom .form-control:focus,  .navbar-form-custom .form-control:hover, .open .btn.dropdown-toggle,  .panel, .popover, .progress, .progress-bar { */
+/*     box-shadow: none; */
+/* } */
 
 .btn-outline {
     color: inherit;
@@ -1818,18 +1818,19 @@ table.dataTable thead .sorting:after {
 .form-control, .single-line {
     background: #FFFFFF none;
     border: 1px solid #e5e6e7;
-    border-radius: 1px;
+    border-radius: 4px;
     color: inherit;
     display: block;
-    padding: 6px 12px;
+    padding: 3px 6px 4px;
     -webkit-transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s  ease-in-out 0s;
     transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s  ease-in-out 0s;
     width: 100%;
+    height: 31px;
     font-size: 14px;
 }
 
 .form-control:focus, .single-line:focus {
-    border-color: #1ab394 !important;
+    border-color: #3c8dbc !important;
 }
 
 .has-success .form-control {

ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css

@@ -330,7 +330,7 @@
 label.error {
 	position: absolute;
 	right: 18px;
-	top: 10px;
+	top: 6px;
 	color: #ef392b;
 	font-size: 12px;
 	z-index:99;
@@ -644,10 +644,10 @@ label {
 	margin: 5px 15px 5px 0px;
 }
 
-.select-list li p, .select-list li label:not(.radio-box):not(.select-time){
+.select-list li p, .select-list li label:not(.radio-box){
 	float: left;
 	width: 65px;
-	margin: 5px 5px 5px 0px;
+	margin: 5px 0px 0px 0px;
 	text-align:right;
 }
 
@@ -681,11 +681,11 @@ label {
 
 .bootstrap-select.form-control .btn-default {
     color: inherit;
-    padding: 6px 12px;
-    border-radius: 1px;
+    padding: 4px 6px 4px;
+    border-radius: 4px;
     border: 1px solid #e5e6e7;
 	outline: none;
-	height: 34px;
+	height: 31px;
 	background: #FFFFFF none
 }
 
@@ -1068,6 +1068,7 @@ label {
 	visibility: visible;
 }
 
+/* 设置滚动条样式 */
 ::-webkit-scrollbar {
     width: 6px;
     height: 10px;
@@ -1077,4 +1078,21 @@ label {
 ::-webkit-scrollbar-thumb {
 	border-radius: 6px;
 	background-color: #999;
-}
+}
+
+/* 设置placeholder样式 */
+::-webkit-input-placeholder {
+	color: #b3b3b3!important;
+}
+
+:-moz-placeholder {
+	color: #b3b3b3!important;
+}
+
+::-moz-placeholder {
+	color: #b3b3b3!important;
+}
+
+:-ms-input-placeholder {
+	color: #b3b3b3!important;
+}

sql/ry_20200617.sql → sql/ry_20200620.sql

@@ -651,8 +651,8 @@ create table gen_table (
   table_id             bigint(20)      not null auto_increment    comment '编号',
   table_name           varchar(200)    default ''                 comment '表名称',
   table_comment        varchar(500)    default ''                 comment '表描述',
-  sub_table_name       varchar(64)     default null               comment '关联父表的表名',
-  sub_table_fk_name    varchar(64)     default null               comment '本表关联父表的外键名',
+  sub_table_name       varchar(64)     default null               comment '关联子表的表名',
+  sub_table_fk_name    varchar(64)     default null               comment '子表关联的外键名',
   class_name           varchar(100)    default ''                 comment '实体类名称',
   tpl_category         varchar(200)    default 'crud'             comment '使用的模板（crud单表操作 tree树表操作 sub主子表操作）',
   package_name         varchar(100)                               comment '生成包路径',