Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/sensor/SensorList.vue

@@ -172,7 +172,7 @@
           {
             title:'工位',
             align:"center",
-            dataIndex: 'stationId'
+            dataIndex: 'stationId_dictText'
           },
           {
             title:'进出标记',
@@ -194,7 +194,7 @@
           deleteBatch: "/sensor/sensor/deleteBatch",
           exportXlsUrl: "/sensor/sensor/exportXls",
           importExcelUrl: "sensor/sensor/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/sensor/entity/Sensor.java

@@ -71,6 +71,7 @@ public class Sensor implements Serializable {
     private String sensorIp;
 	/**工位*/
 	@Excel(name = "工位", width = 15)
+    @Dict(dictTable = "station", dicText = "station_name", dicCode = "id")
     @ApiModelProperty(value = "工位")
     private String stationId;
 	/**工位*/