1. 消除一些警告。

fmvip/db/item.h

-#ifndef ITEM_H
+#ifndef ITEM_H
 #define ITEM_H
 
 #include <QtCore/QString>
@@ -12,6 +12,8 @@
 #include <odb/core.hxx>
 #include <odb/qt/lazy-ptr.hxx>
 
+#pragma warning(disable:4068)
+
 #define DB_VERSION_BASE     1
 #define DB_VERSION_CURRENT  12
 #pragma db model version(DB_VERSION_BASE, DB_VERSION_CURRENT)

fmvip/fmvip.pri

@@ -11,8 +11,6 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 CONFIG += c++11
 
-DEFINES += TEST
-
 SOURCES += \
     $$PWD/backup/fmbackup.cpp \
     $$PWD/backup/resend.cpp \
@@ -40,7 +38,6 @@ SOURCES += \
     $$PWD/fmp_vip_settings.cpp \
     $$PWD/task/coupon.cpp \
     $$PWD/windows/itemdelegate.cpp \
-#    $$PWD/database/dbop.cpp \
     $$PWD/windows/fmviprefund.cpp \
     $$PWD/task/taskrefund.cpp \
     $$PWD/database/fmp_database.cpp \
@@ -79,7 +76,6 @@ HEADERS +=\
     $$PWD/task/coupon.h \
     $$PWD/windows/couponmodel.h \
     $$PWD/windows/itemdelegate.h \
-#    $$PWD/database/dbop.h \
     $$PWD/fmtool.h \
     $$PWD/windows/fmviprefund.h \
     $$PWD/task/taskrefund.h \
@@ -189,5 +185,3 @@ odbh.commands = @
 odbh.CONFIG = no_link
 odbh.depends = ${QMAKE_FILE_BASE}-odb.cxx
 QMAKE_EXTRA_COMPILERS += odbh
-
-

fmvip/task/tasklogin.cpp

@@ -91,7 +91,7 @@ void TaskLogin::onLogin()
         }
 
         bool canPay = (getServerJsonValue(PosProps.CanPay).toInt() == 1);
-#ifdef TEST
+#ifdef FM_TEST
         canPay = true;
 #endif
         if(!canPay) {

version.h

@@ -5,7 +5,7 @@
 #define VER_MINOR 1
 #define VER_REVISION 0
 
-#define VER_BUILD 43
+#define VER_BUILD 46
 
 //! Convert version numbers to string
 #define _STR(S)  #S