no message
This commit is contained in:
parent
4f84341a0b
commit
716aee4939
4 changed files with 17 additions and 22 deletions
|
|
@ -12,13 +12,8 @@ import type {
|
|||
} from "@/modules/11_discipline/interface/response/result";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
|
||||
<<<<<<< HEAD
|
||||
import { useDisciplineMainStore } from "@/modules/11_discipline/store";
|
||||
|
||||
=======
|
||||
import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
>>>>>>> develop
|
||||
const mixin = useCounterMixin();
|
||||
const storeMain = useDisciplineMainStore();
|
||||
const { date2Thai } = mixin;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue