门店表增加设备组字段

share-system/src/main/java/share/system/domain/SStore.java

@@ -55,6 +55,12 @@ public class SStore extends BaseEntity
     @Excel(name = "门店详情")
     private String info;
 
+    /**
+     * 门店详情
+     */
+    @Excel(name = "设备组")
+    private String deviceGroup;
+
     /** 营业状态 0:停业 1:正常营业 */
     @Excel(name = "营业状态 0:停业 1:正常营业")
     private String status;
@@ -163,6 +169,15 @@ public class SStore extends BaseEntity
     {
         return info;
     }
+
+    public String getDeviceGroup() {
+        return deviceGroup;
+    }
+
+    public void setDeviceGroup(String deviceGroup) {
+        this.deviceGroup = deviceGroup;
+    }
+
     public void setStatus(String status)
     {
         this.status = status;
@@ -202,25 +217,22 @@ public class SStore extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("name", getName())
-                .append("images", getImages())
-                .append("address", getAddress())
-                .append("longitude", getLongitude())
-                .append("latitude", getLatitude())
-                .append("manager", getManager())
-                .append("phone", getPhone())
-                .append("info", getInfo())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .append("status", getStatus())
-                .append("openStartTime", getOpenStartTime())
-                .append("openEndTime", getOpenEndTime())
-                .append("storeType", getStoreType())
-                .toString();
+        return "SStore{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", images='" + images + '\'' +
+                ", address='" + address + '\'' +
+                ", longitude='" + longitude + '\'' +
+                ", latitude='" + latitude + '\'' +
+                ", manager='" + manager + '\'' +
+                ", phone='" + phone + '\'' +
+                ", info='" + info + '\'' +
+                ", deviceGroup='" + deviceGroup + '\'' +
+                ", status='" + status + '\'' +
+                ", openStartTime='" + openStartTime + '\'' +
+                ", openEndTime='" + openEndTime + '\'' +
+                ", storeType='" + storeType + '\'' +
+                ", roolList=" + roolList +
+                '}';
     }
 }

share-system/src/main/resources/mapper/system/SStoreMapper.xml

@@ -14,6 +14,7 @@
         <result property="manager"    column="manager"    />
         <result property="phone"    column="phone"    />
         <result property="info"    column="info"    />
+        <result property="deviceGroup" column="device_group"/>
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -26,7 +27,26 @@
     </resultMap>
 
     <sql id="selectSStoreVo">
-        select id, name, images, address, longitude, latitude, manager, phone, info, create_by, create_time, update_by, update_time, remark, status, open_start_time, open_end_time, store_type from s_store
+        select id,
+               name,
+               images,
+               address,
+               longitude,
+               latitude,
+               manager,
+               phone,
+               info,
+               device_group,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark,
+               status,
+               open_start_time,
+               open_end_time,
+               store_type
+        from s_store
     </sql>
 
     <select id="selectSStoreList" parameterType="SStore" resultMap="SStoreResult">
@@ -40,6 +60,7 @@
             <if test="manager != null  and manager != ''"> and manager = #{manager}</if>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
             <if test="info != null  and info != ''"> and info = #{info}</if>
+            <if test="deviceGroup != null  and deviceGroup != ''">and device_group = #{deviceGroup}</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="openStartTime != null "> and open_start_time = #{openStartTime}</if>
             <if test="openEndTime != null "> and open_end_time = #{openEndTime}</if>
@@ -63,6 +84,7 @@
             <if test="manager != null">manager,</if>
             <if test="phone != null">phone,</if>
             <if test="info != null">info,</if>
+            <if test="deviceGroup != null">device_group,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -82,6 +104,7 @@
             <if test="manager != null">#{manager},</if>
             <if test="phone != null">#{phone},</if>
             <if test="info != null">#{info},</if>
+            <if test="deviceGroup != null">#{deviceGroup},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -105,6 +128,7 @@
             <if test="manager != null">manager = #{manager},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="info != null">info = #{info},</if>
+            <if test="deviceGroup != null">device_group = #{deviceGroup},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>