Merge remote-tracking branch 'origin/master'

cl

2024-01-18 aac927d42bfa7cbf1aaa14bf206f6eeb0bb9f286

 jcdm-ui/src/views/main/om/productionOrde/index.vue

@@ -117,9 +117,9 @@
<!--      </el-col>-->
      <el-col :span="1.5">
        <el-button
          type="warning"
          type="success"
          plain
          icon="el-icon-download"
          icon="el-icon-wind-power"
          size="mini"
          @click="getProductionNotice"
          v-hasPermi="['om:productionOrde:receive']"