Merge remote-tracking branch 'origin/master'

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesSixMinesSummaryTable.java

@@ -51,7 +51,7 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
 
     /** 日期 */
     @Excel(name = "日期")
-    private String date;
+    private String hDate;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -131,12 +131,12 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
         this.createBy = createBy;
     }
 
-    public String getDate() {
-        return date;
+    public String gethDate() {
+        return hDate;
     }
 
-    public void setDate(String date) {
-        this.date = date;
+    public void sethDate(String hDate) {
+        this.hDate = hDate;
     }
 
     @Override
@@ -151,7 +151,7 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
                 ", nuitPrice=" + nuitPrice +
                 ", money=" + money +
                 ", createBy='" + createBy + '\'' +
-                ", date=" + date +
+                ", hDate=" + hDate +
                 '}';
     }
 }

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesCleaningRuleMapper.xml

@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nuitPrice"    column="nuit_price"    />
         <result property="money"    column="money"    />
         <result property="createBy"    column="create_by"    />
-        <result property="date"    column="date"    />
+        <result property="hDate"    column="date"    />
 
     </resultMap>
     <insert id="addActSuppliesSixMinesSummaryTable" parameterType="ActSuppliesSixMinesSummaryTable" useGeneratedKeys="true" keyProperty="id">
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nuitPrice != null">nuit_price,</if>
             <if test="money != null">money,</if>
             <if test="createBy != null">create_by,</if>
-            <if test="date != null">date,</if>
+            <if test="hDate != null">h_date,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="hId != null">#{hId},</if>
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nuitPrice != null">#{nuitPrice},</if>
             <if test="money != null">#{money},</if>
             <if test="createBy != null">#{createBy},</if>
-            <if test="date != null">#{date},</if>
+            <if test="hDate != null">#{hDate},</if>
         </trim>
     </insert>
 

ruoyi-ui/src/views/system/supplies/index.vue

@@ -127,7 +127,7 @@ export default {
                 nuitPrice : "",
                 money : "",
                 createBy  : "",
-                date : null
+                hDate : null
 
             },
             dfrom:{},
@@ -1301,7 +1301,7 @@ export default {
                                     this.froms.nuitPrice =a5;
                                     this.froms.money =a6;
                                     this.froms.createBy = data[i].createBy;
-                                    this.froms.date = data[i].date;
+                                    this.froms.hDate = data[i].date;
                                     addActSuppliesSixMinesSummaryTable(this.froms).then(response => {});
                                 }
                             }