Merge branch 'han' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionAttendanceServiceImpl.java

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-
-import com.usky.agbox.RemotePatrolAgboxService;
+import com.usky.agbox.RemotePatrolAgBoxService;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.security.utils.SecurityUtils;
@@ -54,7 +52,7 @@ public class PatrolInspectionAttendanceServiceImpl extends AbstractCrudService<P
     private PatrolInspectionPersonnelMapper patrolInspectionPersonnelMapper;
 
     @Autowired
-    private RemotePatrolAgboxService remotePatrolAgboxService;
+    private RemotePatrolAgBoxService remotePatrolAgboxService;
     @Override
     public IPage<Map<String, Object>> pageList(Integer pageNum, Integer pageSize, String operateCode, String operator, LocalDateTime startTime, LocalDateTime endTime) {
         IPage<PatrolInspectionAttendance> page = new Page<>(pageNum, pageSize);

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAppInfoServiceImpl.java

@@ -1,7 +1,7 @@
 package com.usky.iot.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.usky.agbox.RemotePatrolAgboxService;
+import com.usky.agbox.RemotePatrolAgBoxService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.BaseAppInfo;
 import com.usky.iot.mapper.BaseAppInfoMapper;
@@ -28,7 +28,7 @@ import java.time.LocalDateTime;
 public class BaseAppInfoServiceImpl extends AbstractCrudService<BaseAppInfoMapper, BaseAppInfo> implements BaseAppInfoService {
 
     @Autowired
-    private RemotePatrolAgboxService remotePatrolAgboxService;
+    private RemotePatrolAgBoxService remotePatrolAgboxService;
 
     public String getIpAddress(HttpServletRequest request) {
         String ip = request.getHeader("X-Forwarded-For");

service-website/service-website-biz/src/main/java/com/usky/website/domain/SiteCategory.java

@@ -105,6 +105,11 @@ public class SiteCategory implements Serializable {
      */
     private Integer categoryStyle;
 
+    /**
+     * 标题
+     */
+    private String title;
+
     /**
      * 子级
      */

service-website/service-website-biz/src/main/resources/mapper/website/SiteCategoryMapper.xml

@@ -19,6 +19,7 @@
         <result column="status" property="status" />
         <result column="model_type" property="modelType" />
         <result column="category_style" property="categoryStyle" />
+        <result column="title" property="title" />
     </resultMap>
 
 </mapper>