Merge remote-tracking branch 'origin/duhanyu'

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java

@@ -254,6 +254,7 @@ public class AssetCurrentController extends BaseController {
     /**
      * 导入现有资产
      */
+    @Transactional(rollbackFor = Exception.class)
     @PreAuthorize("@ss.hasAnyRoles('admin,common')")
     @ApiOperation(value = "导入现有资产")
     @PostMapping(value = "/import", consumes = "multipart/form-data")

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java

@@ -77,6 +77,7 @@ public class UnitController {
     /**
      * 单位导入
      */
+    @Transactional(rollbackFor = Exception.class)
     @ApiOperation(value = "单位导入")
     @Log(title = "单位导入", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java

@@ -37,7 +37,6 @@ public class AssetCurrent extends BaseClass implements Serializable {
     */
     @NotBlank
     @Size(max= 100,message="系统名称长度不能超过100")
-    @Excel(name = "*系统名称",sort = 2,width = 40,required = true)
     @ApiModelProperty("系统名称")
     private String xtmc;
     /**

ruoyi-admin/src/main/resources/mapper/UnitMapper.xml

@@ -97,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.user_name like concat('%',#{req.userName},'%')
             </if>
         </where>
+        order by create_time desc
     </select>
     <select id="getById" parameterType="unit" resultMap="unitResult">
         select a.*,c.*,e.* from unit_info a