Merge remote-tracking branch 'origin/master'

Lius

2025-07-28 14cb7a64c338f3205e759ad5efc3bf33a8dd82db

Merge remote-tracking branch 'origin/master'

 src/views/base/FactoryManager.vue

@@ -119,11 +119,11 @@
  </a-row>
</template>
<script>
  import UserFactory from './modules/FactoryManager/UserFactory'
  import UserFactory from './modules/factoryManager/UserFactory'
  import { queryFactoryTreeList, searchByKeywords, deleteByFactory } from '@/api/api'
  import { httpAction, deleteAction } from '@/api/manage'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import FactoryModal from './modules/FactoryManager/FactoryModal'
  import FactoryModal from './modules/factoryManager/FactoryModal'

  export default {
    name: 'FactoryManager',

 src/views/base/modules/factoryManager/FactoryModal.vue

 src/views/base/modules/factoryManager/SelectUserModal.vue

 src/views/base/modules/factoryManager/UserFactory.vue