Browse code Merge branch 'master' of http://192.168.0.203:8080/gitbucket/git/root/GHFX_REFACTOR Conflicts: Cyberpipe.suo MainFrm.designer.cs MainFrm.resx develop fuzhou fuzhouyq ganzhou master shouguang 1.1.0.0 1.0.0.0 1.0.0 0.1.0
commit 31e1b9da230305353641c1ee9decb92c450ad066 2 parents 0cdfbb2 + 5f28d68 wxn authored on 24 Mar 2017

Showing 69 changed files

• .merge_file_a10004
• ClassExpCad.cs
• Cyberpipe.csproj
• Cyberpipe.suo
• FormAnalysis/FormFT.cs
• FormAnalysis/FormHor.cs
• FormAnalysis/FormVer.cs
• GHFX_SQL/V0_0_200__CASIC_APP_PATROLER_SEQ.sql
• GHFX_SQL/V0_0_201__CASIC_APP_PATROLER_TBL.sql
• GHFX_SQL/V0_0_202__CASIC_APP_PATROLER_TRI.sql
• GHFX_SQL/V0_0_203__CASIC_APP_PATROLER_DATA.sql
• GHFX_SQL/V0_0_204__CASIC_APP_WORKSHEET_TYPE_SEQ.sql
• GHFX_SQL/V0_0_205__CASIC_APP_WORKSHEET_TYPE_TBL.sql
• GHFX_SQL/V0_0_206__CASIC_APP_WORKSHEET_TYPE_TRI.sql
• GHFX_SQL/V0_0_207__CASIC_APP_WORKSHEET_TYPE_DATA.sql
• GHFX_SQL/V0_0_208__CASIC_APP_WORKSHEET_SEQ.sql
• GHFX_SQL/V0_0_209__CASIC_APP_WORKSHEET_TBL.sql
• GHFX_SQL/V0_0_210__CASIC_APP_WORKSHEET_TRI.sql
• GHFX_SQL/V0_0_211__CASIC_APP_WORKSHEET_DATA.sql
• GHFX_SQL/V0_0_212__CASIC_AUDIT_RESULT_SEQ.sql
• GHFX_SQL/V0_0_213__CASIC_AUDIT_RESULT_TBL.sql
• GHFX_SQL/V0_0_214__CASIC_AUDIT_RESULT_TRI.sql
• GHFX_SQL/V0_0_215__CASIC_AUDIT_RESULT_DATA.sql
• GHFX_SQL/V0_0_216__CASIC_FUNCLIST_SEQ.sql
• GHFX_SQL/V0_0_217__CASIC_FUNCLIST_TBL.sql
• GHFX_SQL/V0_0_218__CASIC_FUNCLIST_TRI.sql
• GHFX_SQL/V0_0_219__CASIC_FUNCLIST_DATA.sql
• GHFX_SQL/V0_0_220__CASIC_LOGINFO_SEQ.sql
• GHFX_SQL/V0_0_221__CASIC_LOGINFO_TBL.sql
• GHFX_SQL/V0_0_222__CASIC_LOGINFO_TRI.sql
• GHFX_SQL/V0_0_223__CASIC_LOGINFO_DATA.sql
• GHFX_SQL/V0_0_224__CASIC_METADATACONTENT_SEQ.sql
• GHFX_SQL/V0_0_225__CASIC_METADATACONTENT_TBL.sql
• GHFX_SQL/V0_0_226__CASIC_METADATACONTENT_TRI.sql
• GHFX_SQL/V0_0_227__CASIC_METADATACONTENT_DATA.sql
• GHFX_SQL/V0_0_228__CASIC_METADATALAYER_SEQ.sql
• GHFX_SQL/V0_0_229__CASIC_METADATALAYER_TBL.sql
• GHFX_SQL/V0_0_230__CASIC_METADATALAYER_TRI.sql
• GHFX_SQL/V0_0_231__CASIC_METADATALAYER_DATA.sql
• GHFX_SQL/V0_0_232__CASIC_USERDOCUMENT_SEQ.sql
• GHFX_SQL/V0_0_233__CASIC_USERDOCUMENT_TBL.sql
• GHFX_SQL/V0_0_234__CASIC_USERDOCUMENT_TRI.sql
• GHFX_SQL/V0_0_235__CASIC_USERDOCUMENT_DATA.sql
• GHFX_SQL/V0_0_236__CASIC_USERRESCTEST_SEQ.sql
• GHFX_SQL/V0_0_237__CASIC_USERRESCTEST_TBL.sql
• GHFX_SQL/V0_0_238__CASIC_USERRESCTEST_TRI.sql
• GHFX_SQL/V0_0_239__CASIC_USERRESCTEST_DATA.sql
• GHFX_SQL/V0_0_240__CASIC_USERROLETEST_SEQ.sql
• GHFX_SQL/V0_0_241__CASIC_USERROLETEST_TBL.sql
• GHFX_SQL/V0_0_242__CASIC_USERROLETEST_TRI.sql
• GHFX_SQL/V0_0_243__CASIC_USERROLETEST_DATA.sql
• GHFX_SQL/V0_0_244__CASIC_USERINFOTEST_SEQ.sql
• GHFX_SQL/V0_0_245__CASIC_USERINFOTEST_TBL.sql
• GHFX_SQL/V0_0_246__CASIC_USERINFOTEST_TRI.sql
• GHFX_SQL/V0_0_247__CASIC_USERINFOTEST_DATA.sql
• GHFX_SQL/V0_0_248__CASIC_USERSTATUS_SEQ.sql
• GHFX_SQL/V0_0_249__CASIC_USERSTATUS_TBL.sql
• GHFX_SQL/V0_0_250__CASIC_USERSTATUS_TRI.sql
• GHFX_SQL/V0_0_251__CASIC_USERRESCTEST_DATA_UPDATE.sql
• GHFX_SQL/V0_0_252__CASIC_USERROLETEST_DATA_UPDATE.sql
• GHFX_SQL/V0_0_253__CASIC_FUNCLIST_DATA_UPDATE.sql
• GHFX_SQL/V0_0_254__CASIC_APP_PATROLER_DATA_UPDATE.sql
• GHFX_SQL/V0_0_255__CASIC_USERINFOTEST_DATA_UPDATE.sql
• MainFrm.cs
• MainFrm.designer.cs
• MainFrm.designer.cs.BACKUP.9524.cs
• MainFrm.designer.cs.BASE.9524.cs
• MainFrm.resx
• bin/x86/Debug/DXFLibrary.dll

Ignore Space Show notes View .merge_file_a10004 0 → 100644

Ignore Space Show notes View ClassExpCad.cs 0 → 100644

Ignore Space Show notes View Cyberpipe.csproj

Ignore Space Show notes View Cyberpipe.suo
Not supported

Ignore Space Show notes View FormAnalysis/FormFT.cs

Ignore Space Show notes View FormAnalysis/FormHor.cs

Ignore Space Show notes View FormAnalysis/FormVer.cs

Show notes View GHFX_SQL/V0_0_200__CASIC_APP_PATROLER_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_201__CASIC_APP_PATROLER_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_202__CASIC_APP_PATROLER_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_203__CASIC_APP_PATROLER_DATA.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_204__CASIC_APP_WORKSHEET_TYPE_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_205__CASIC_APP_WORKSHEET_TYPE_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_206__CASIC_APP_WORKSHEET_TYPE_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_207__CASIC_APP_WORKSHEET_TYPE_DATA.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_208__CASIC_APP_WORKSHEET_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_209__CASIC_APP_WORKSHEET_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_210__CASIC_APP_WORKSHEET_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_211__CASIC_APP_WORKSHEET_DATA.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_212__CASIC_AUDIT_RESULT_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_213__CASIC_AUDIT_RESULT_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_214__CASIC_AUDIT_RESULT_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_215__CASIC_AUDIT_RESULT_DATA.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_216__CASIC_FUNCLIST_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_217__CASIC_FUNCLIST_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_218__CASIC_FUNCLIST_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_219__CASIC_FUNCLIST_DATA.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_220__CASIC_LOGINFO_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_221__CASIC_LOGINFO_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_222__CASIC_LOGINFO_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_223__CASIC_LOGINFO_DATA.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_224__CASIC_METADATACONTENT_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_225__CASIC_METADATACONTENT_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_226__CASIC_METADATACONTENT_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_227__CASIC_METADATACONTENT_DATA.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_228__CASIC_METADATALAYER_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_229__CASIC_METADATALAYER_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_230__CASIC_METADATALAYER_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_231__CASIC_METADATALAYER_DATA.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_232__CASIC_USERDOCUMENT_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_233__CASIC_USERDOCUMENT_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_234__CASIC_USERDOCUMENT_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_235__CASIC_USERDOCUMENT_DATA.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_236__CASIC_USERRESCTEST_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_237__CASIC_USERRESCTEST_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_238__CASIC_USERRESCTEST_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_239__CASIC_USERRESCTEST_DATA.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_240__CASIC_USERROLETEST_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_241__CASIC_USERROLETEST_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_242__CASIC_USERROLETEST_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_243__CASIC_USERROLETEST_DATA.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_244__CASIC_USERINFOTEST_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_245__CASIC_USERINFOTEST_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_246__CASIC_USERINFOTEST_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_247__CASIC_USERINFOTEST_DATA.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_248__CASIC_USERSTATUS_SEQ.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_249__CASIC_USERSTATUS_TBL.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_250__CASIC_USERSTATUS_TRI.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_251__CASIC_USERRESCTEST_DATA_UPDATE.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_252__CASIC_USERROLETEST_DATA_UPDATE.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_253__CASIC_FUNCLIST_DATA_UPDATE.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_254__CASIC_APP_PATROLER_DATA_UPDATE.sql 100644 → 0

Show notes View GHFX_SQL/V0_0_255__CASIC_USERINFOTEST_DATA_UPDATE.sql 100644 → 0

Ignore Space Show notes View MainFrm.cs

Ignore Space Show notes View MainFrm.designer.cs

Ignore Space Show notes View MainFrm.designer.cs.BACKUP.9524.cs 0 → 100644

Ignore Space Show notes View MainFrm.designer.cs.BASE.9524.cs 0 → 100644

Ignore Space Show notes View MainFrm.resx

Ignore Space Show notes View bin/x86/Debug/DXFLibrary.dll 0 → 100644
Not supported

Show line notes below