-
由 wangkr 提交于
Conflicts: .gitignore application/admin/view/staff/role.html config/admin.php public/page/fonts/element-icons.535877f5.woff public/page/fonts/element-icons.732389de.ttf public/page/fonts/iconfont.0208023e.0208023e.eot public/page/fonts/iconfont.d8583a84.d8583a84.ttf public/page/fonts/iconfont.e9caaa06.e9caaa06.woff public/page/img/bpmn.deea5c90.svg public/page/img/icon-ext.ba81b24c.ba81b24c.png public/page/img/icon.551539f8.551539f8.png public/page/img/iconfont.5d06b488.5d06b488.svg public/page/img/loading-0.a72011cc.a72011cc.gif 修改: application/admin/controller/Base.php 删除: application/admin/controller/Excel(1).php 修改: application/admin/controller/SingleSign.php 修改: application/admin/model/PermissionModel.php 新文件: application/admin/validate/FkAddValidate.php 修改: application/admin/view/basestation/base_region.html 修改: application/admin/view/permission/index.html 修改: application/admin/view/staff/role.html 修改: application/admin/view/staff/role1.html 修改: application/api/common.php 新文件: application/api/controller/v2/common/Payment.php 新文件: application/api/controller/v2/common/Project.php 修改: application/em/common.php 修改: application/em/controller/Account.php 修改: application/em/controller/Em.php 修改: application/em/controller/Invoice.php 修改: application/em/controller/Payment.php 新文件: application/em/controller/Receipt.php 修改: application/em/controller/Region.php 修改: application/em/controller/Useage.php 删除: application/em/controller/Useage.php.bak 新文件: application/em/controller/WriteOff.php 修改: application/em/model/Em.php 新文件: application/em/model/EmAccountAmount.php 修改: application/em/model/EmCheckBill.php 修改: application/em/model/EmInvoice.php 修改: application/em/model/EmPayment.php 新文件: application/em/model/EmPaymentAccount.php 新文件: application/em/model/EmPaymentFk.php 新文件: application/em/model/EmPaymentMonthly.php 删除: application/em/model/Invoice.php 修改: application/em/model/Staff.php 新文件: application/em/validate/AddFkInfoDetailsValidate.php 新文件: application/em/validate/AddFkInfoValidate.php 修改: application/em/validate/UseageGeneralInfoValidate.php 修改: application/em/view/em/index.html 删除: application/em/view/invoice/Invoice.php 修改: application/em/view/invoice/detail.html 修改: application/em/view/invoice/index.html 删除: application/em/view/invoice/index_back.html 修改: application/em/view/invoice/merge_list.html 修改: application/em/view/payment/create.html 删除: application/em/view/payment/create2.html 删除: application/em/view/payment/create3.html 修改: application/em/view/payment/detail.html 修改: application/em/view/payment/index.html 新文件: application/em/view/payment/pay_oa.html 修改: application/em/view/region/region_list.html 新文件: application/em/view/region/region_list1.html 修改: application/em/view/useage/default.html 修改: application/em/view/useage/detail.html 修改: application/em/view/useage/detail_special.html 修改: application/em/view/useage/update.html 新文件: config/admin.php 新文件: config/oafk.php 新文件: public/page/css/app.96f2bf7e.css 新文件: public/page/favicon.ico 新文件: public/page/fonts/bpmn.499c9aa3.eot 新文件: public/page/fonts/bpmn.9b84e8c8.ttf 新文件: public/page/fonts/bpmn.b5d0cc49.woff 新文件: public/page/fonts/bpmn.f3d4b5d1.woff2 新文件: public/page/fonts/element-icons.535877f5.woff 新文件: public/page/fonts/element-icons.732389de.ttf 新文件: public/page/fonts/iconfont.0208023e.0208023e.eot 新文件: public/page/fonts/iconfont.d8583a84.d8583a84.ttf 新文件: public/page/fonts/iconfont.e9caaa06.e9caaa06.woff 新文件: public/page/img/bpmn.deea5c90.svg 新文件: public/page/img/icon-ext.ba81b24c.ba81b24c.png 新文件: public/page/img/icon.551539f8.551539f8.png 新文件: public/page/img/iconfont.5d06b488.5d06b488.svg 新文件: public/page/img/loading-0.a72011cc.a72011cc.gif 新文件: public/page/index.html 新文件: public/page/js/app.7eaa479e.js 新文件: public/page/js/app.7eaa479e.js.LICENSE 新文件: public/page/js/app.81004bd3.js 新文件: public/page/js/app.81004bd3.js.LICENSE 新文件: public/page1/css/app.7ad51aae.css 新文件: public/page1/css/app.f5cc36b7.css 新文件: public/page1/css/chunk-vendors.b27c2f9a.css 新文件: public/page1/favicon.ico 新文件: public/page1/fonts/bpmn.499c9aa3.eot 新文件: public/page1/fonts/bpmn.9b84e8c8.ttf 新文件: public/page1/fonts/bpmn.b5d0cc49.woff 新文件: public/page1/fonts/bpmn.f3d4b5d1.woff2 新文件: public/page1/fonts/element-icons.535877f5.woff 新文件: public/page1/fonts/element-icons.732389de.ttf 新文件: public/page1/fonts/iconfont.0208023e.0208023e.eot 新文件: public/page1/fonts/iconfont.d8583a84.d8583a84.ttf 新文件: public/page1/fonts/iconfont.e9caaa06.e9caaa06.woff 新文件: public/page1/img/bpmn.deea5c90.svg 新文件: public/page1/img/icon-ext.ba81b24c.ba81b24c.png 新文件: public/page1/img/icon.551539f8.551539f8.png 新文件: public/page1/img/iconfont.5d06b488.5d06b488.svg 新文件: public/page1/img/loading-0.a72011cc.a72011cc.gif 新文件: public/page1/index.html 新文件: public/page1/js/app.aa6907c3.js 新文件: public/page1/js/app.aa6907c3.js.LICENSE 新文件: public/page1/js/app.bc5c248b.js 新文件: public/page1/js/chunk-vendors.a06d51ef.js 修改: public/static/admin/css/style.css 修改: public/static/xadmin/lib/layui/lay/modules/tree.js 修改: route/admin.php 修改: route/api.php
686074ef
名称 |
最后提交
|
最后更新 |
---|---|---|
.. | ||
controller | ||
model | ||
validate | ||
view | ||
common.php |