|
|
@@ -32,12 +32,8 @@ const gljUtil = require('../../../public/gljUtil');
|
|
|
let stdColSettingModel = mongoose.model('std_main_col_lib');
|
|
|
let decimal_facade = require('../../main/facade/decimal_facade');
|
|
|
const scMathUtil = require('../../../public/scMathUtil').getUtil();
|
|
|
-<<<<<<< HEAD
|
|
|
const calcUtil = require('../../../public/calculate_util')
|
|
|
-import fixedFlag from '../../common/const/bills_fixed';
|
|
|
-=======
|
|
|
const { fixedFlag } = require('../../../public/common_constants');
|
|
|
->>>>>>> c83f22ec04291c4917947be0692f93b4ab7f9a54
|
|
|
import GLJListModel from "../../glj/models/glj_list_model";
|
|
|
const projectDao = require('../../pm/models/project_model').project;
|
|
|
|
