Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/pm/monitoring-device/PmMonitoringDeviceList.vue

@@ -151,11 +151,11 @@
             align:"center",
             dataIndex: 'place'
           },
-          {
-            title:'xy值',
-            align:"center",
-            dataIndex: 'coordinate'
-          },
+          // {
+          //   title:'xy值',
+          //   align:"center",
+          //   dataIndex: 'coordinate'
+          // },
           {
             title:'生产日期',
             align:"center",

ant-design-vue-jeecg/src/views/pm/monitoring-device/modules/PmMonitoringDeviceForm.vue

@@ -33,11 +33,11 @@
               <a-input v-model="model.place" placeholder="请输入设备位置"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="xy值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coordinate">
-              <a-input v-model="model.coordinate" placeholder="请输入xy值"  ></a-input>
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="xy值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coordinate">-->
+<!--              <a-input v-model="model.coordinate" placeholder="请输入xy值"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="生产日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dateOfProduction">
               <j-date placeholder="请选择生产日期" v-model="model.dateOfProduction"  style="width: 100%" />
@@ -55,7 +55,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="生产厂商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manufacturer">
-              <j-date placeholder="请选择生产厂商" v-model="model.manufacturer"  style="width: 100%" />
+              <a-input v-model="model.manufacturer" placeholder="请输入生产厂商"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -63,21 +63,21 @@
               <a-input v-model="model.status" placeholder="请输入状态"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="创建人Id（sys_user）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createUserId">
-              <a-input v-model="model.createUserId" placeholder="请输入创建人Id（sys_user）"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="修改人Id（sys_user）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modifyUserId">
-              <a-input v-model="model.modifyUserId" placeholder="请输入修改人Id（sys_user）"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="修改时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modifyTime">
-              <j-date placeholder="请选择修改时间" v-model="model.modifyTime"  style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="创建人Id（sys_user）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createUserId">-->
+<!--              <a-input v-model="model.createUserId" placeholder="请输入创建人Id"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="修改人Id（sys_user）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modifyUserId">-->
+<!--              <a-input v-model="model.modifyUserId" placeholder="请输入修改人Id（sys_user）"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="修改时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modifyTime">-->
+<!--              <j-date placeholder="请选择修改时间" v-model="model.modifyTime"  style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-parent/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/pm/entity/PmMonitoringDevice.java

@@ -79,13 +79,14 @@ public class PmMonitoringDevice implements Serializable {
     @Excel(name = "设备位置", width = 15)
     @ApiModelProperty(value = "设备位置")
     private String place;
-    /**
-     * xy值
-     */
-    @Excel(name = "xy值", width = 15)
-    @ApiModelProperty(value = "xy值")
-    @TableField(typeHandler = Coordinate.TypeHandler.class)
-    private Coordinate coordinate;
+
+//    /**
+//     * xy值
+//     */
+//    @Excel(name = "xy值", width = 15)
+//    @ApiModelProperty(value = "xy值")
+//    @TableField(typeHandler = Coordinate.TypeHandler.class)
+//    private Coordinate coordinate;
     /**
      * 生产日期
      */