diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css index 7e3b06c75..5091bc757 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css +++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css @@ -644,7 +644,7 @@ label { margin: 5px 15px 5px 0px; } -.select-list li p, .select-list li label:not(.radio-box){ +.select-list li p, .select-list li label:not(.radio-box):not(:select-time){ float: left; width: 65px; margin: 5px 5px 5px 0px; diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 9a12c06eb..aebd9b4f6 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" list_class = #{listClass}, is_default = #{isDefault}, status = #{status}, - remark = #{remark}, + remark = #{remark}, update_by = #{updateBy}, update_time = sysdate() @@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by, create_time )values( - #{dictSort}, + #{dictSort}, #{dictLabel}, #{dictValue}, #{dictType},